Skip to content

Commit a0cb917

Browse files
ianaya89ianaya89
committed
release: v0.5.2
1 parent 25d6200 commit a0cb917

12 files changed

Lines changed: 792 additions & 1243 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [0.5.2](https://github.com/Altinity/terraform-provider-altinitycloud/compare/v0.5.1...v0.5.2)
8+
### Fixed
9+
- Revert `metricsEndpoint` from SDK until API is fully deployed [25d6200](https://github.com/Altinity/terraform-provider-altinitycloud/commit/25d6200).
10+
711
## [0.5.1](https://github.com/Altinity/terraform-provider-altinitycloud/compare/v0.5.0...v0.5.1)
812
### Fixed
913
- Revert support `metrics_endpoint` until API is fully deployed [20fea37](https://github.com/Altinity/terraform-provider-altinitycloud/commit/20fea37).

‎internal/provider/env/aws/model.go‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -611,37 +611,37 @@ func icebergToModel(iceberg *sdk.AWSEnvSpecFragment_Iceberg) *AWSEnvIcebergModel
611611
}
612612
}
613613

614-
func metricsEndpointToSDK(endpoint *AWSEnvMetricsEndpointModel) *sdk.MetricsEndpointSpecInput {
615-
if endpoint == nil {
616-
return nil
617-
}
618-
619-
var sourceIPRanges []string
620-
for _, ip := range endpoint.SourceIPRanges {
621-
sourceIPRanges = append(sourceIPRanges, ip.ValueString())
622-
}
623-
624-
return &sdk.MetricsEndpointSpecInput{
625-
Enabled: endpoint.Enabled.ValueBoolPointer(),
626-
SourceIPRanges: sourceIPRanges,
627-
}
628-
}
629-
630-
func metricsEndpointToModel(endpoint *sdk.AWSEnvSpecFragment_MetricsEndpoint) *AWSEnvMetricsEndpointModel {
631-
if endpoint == nil {
632-
return nil
633-
}
634-
635-
var sourceIPRanges []types.String
636-
for _, ip := range endpoint.SourceIPRanges {
637-
sourceIPRanges = append(sourceIPRanges, types.StringValue(ip))
638-
}
639-
640-
return &AWSEnvMetricsEndpointModel{
641-
Enabled: types.BoolValue(endpoint.Enabled),
642-
SourceIPRanges: sourceIPRanges,
643-
}
644-
}
614+
// func metricsEndpointToSDK(endpoint *AWSEnvMetricsEndpointModel) *sdk.MetricsEndpointSpecInput {
615+
// if endpoint == nil {
616+
// return nil
617+
// }
618+
619+
// var sourceIPRanges []string
620+
// for _, ip := range endpoint.SourceIPRanges {
621+
// sourceIPRanges = append(sourceIPRanges, ip.ValueString())
622+
// }
623+
624+
// return &sdk.MetricsEndpointSpecInput{
625+
// Enabled: endpoint.Enabled.ValueBoolPointer(),
626+
// SourceIPRanges: sourceIPRanges,
627+
// }
628+
// }
629+
630+
// func metricsEndpointToModel(endpoint *sdk.AWSEnvSpecFragment_MetricsEndpoint) *AWSEnvMetricsEndpointModel {
631+
// if endpoint == nil {
632+
// return nil
633+
// }
634+
635+
// var sourceIPRanges []types.String
636+
// for _, ip := range endpoint.SourceIPRanges {
637+
// sourceIPRanges = append(sourceIPRanges, types.StringValue(ip))
638+
// }
639+
640+
// return &AWSEnvMetricsEndpointModel{
641+
// Enabled: types.BoolValue(endpoint.Enabled),
642+
// SourceIPRanges: sourceIPRanges,
643+
// }
644+
// }
645645

646646
func reorderTags(model []common.KeyValueModel, tags []*sdk.AWSEnvSpecFragment_Tags) []*sdk.AWSEnvSpecFragment_Tags {
647647
orderedTags := make([]*sdk.AWSEnvSpecFragment_Tags, 0, len(tags))

‎internal/provider/env/aws/model_test.go‎

Lines changed: 127 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -2069,130 +2069,130 @@ func TestIcebergToModel(t *testing.T) {
20692069
}
20702070
}
20712071

2072-
func TestMetricsEndpointToSDK(t *testing.T) {
2073-
t.Skip("metrics_endpoint temporarily removed from schema")
2074-
tests := []struct {
2075-
name string
2076-
input *AWSEnvMetricsEndpointModel
2077-
expected *sdk.MetricsEndpointSpecInput
2078-
}{
2079-
{
2080-
name: "Nil input",
2081-
input: nil,
2082-
expected: nil,
2083-
},
2084-
{
2085-
name: "Complete metrics endpoint config",
2086-
input: &AWSEnvMetricsEndpointModel{
2087-
Enabled: types.BoolValue(true),
2088-
SourceIPRanges: []types.String{types.StringValue("10.0.0.0/8"), types.StringValue("192.168.1.0/24")},
2089-
},
2090-
expected: &sdk.MetricsEndpointSpecInput{
2091-
Enabled: &[]bool{true}[0],
2092-
SourceIPRanges: []string{"10.0.0.0/8", "192.168.1.0/24"},
2093-
},
2094-
},
2095-
{
2096-
name: "Metrics endpoint disabled with empty source IP ranges",
2097-
input: &AWSEnvMetricsEndpointModel{
2098-
Enabled: types.BoolValue(false),
2099-
SourceIPRanges: []types.String{},
2100-
},
2101-
expected: &sdk.MetricsEndpointSpecInput{
2102-
Enabled: &[]bool{false}[0],
2103-
SourceIPRanges: nil,
2104-
},
2105-
},
2106-
}
2107-
2108-
for _, tt := range tests {
2109-
t.Run(tt.name, func(t *testing.T) {
2110-
result := metricsEndpointToSDK(tt.input)
2111-
2112-
if (tt.expected == nil) != (result == nil) {
2113-
t.Errorf("Expected nil: %v, got nil: %v", tt.expected == nil, result == nil)
2114-
return
2115-
}
2116-
2117-
if tt.expected != nil && result != nil {
2118-
if *tt.expected.Enabled != *result.Enabled {
2119-
t.Errorf("Enabled mismatch: expected %v, got %v", *tt.expected.Enabled, *result.Enabled)
2120-
}
2121-
2122-
if len(tt.expected.SourceIPRanges) != len(result.SourceIPRanges) {
2123-
t.Errorf("SourceIPRanges count mismatch: expected %d, got %d", len(tt.expected.SourceIPRanges), len(result.SourceIPRanges))
2124-
} else {
2125-
for i, expected := range tt.expected.SourceIPRanges {
2126-
if expected != result.SourceIPRanges[i] {
2127-
t.Errorf("SourceIPRanges[%d] mismatch: expected '%s', got '%s'", i, expected, result.SourceIPRanges[i])
2128-
}
2129-
}
2130-
}
2131-
}
2132-
})
2133-
}
2134-
}
2135-
2136-
func TestMetricsEndpointToModel(t *testing.T) {
2137-
t.Skip("metrics_endpoint temporarily removed from schema")
2138-
tests := []struct {
2139-
name string
2140-
input *sdk.AWSEnvSpecFragment_MetricsEndpoint
2141-
expected *AWSEnvMetricsEndpointModel
2142-
}{
2143-
{
2144-
name: "Nil input",
2145-
input: nil,
2146-
expected: nil,
2147-
},
2148-
{
2149-
name: "Complete metrics endpoint response",
2150-
input: &sdk.AWSEnvSpecFragment_MetricsEndpoint{
2151-
Enabled: true,
2152-
SourceIPRanges: []string{"10.0.0.0/8", "172.16.0.0/12"},
2153-
},
2154-
expected: &AWSEnvMetricsEndpointModel{
2155-
Enabled: types.BoolValue(true),
2156-
SourceIPRanges: []types.String{types.StringValue("10.0.0.0/8"), types.StringValue("172.16.0.0/12")},
2157-
},
2158-
},
2159-
{
2160-
name: "Metrics endpoint disabled with empty source IP ranges",
2161-
input: &sdk.AWSEnvSpecFragment_MetricsEndpoint{
2162-
Enabled: false,
2163-
SourceIPRanges: []string{},
2164-
},
2165-
expected: &AWSEnvMetricsEndpointModel{
2166-
Enabled: types.BoolValue(false),
2167-
SourceIPRanges: nil,
2168-
},
2169-
},
2170-
}
2171-
2172-
for _, tt := range tests {
2173-
t.Run(tt.name, func(t *testing.T) {
2174-
result := metricsEndpointToModel(tt.input)
2175-
2176-
if (tt.expected == nil) != (result == nil) {
2177-
t.Errorf("Expected nil: %v, got nil: %v", tt.expected == nil, result == nil)
2178-
return
2179-
}
2180-
2181-
if tt.expected != nil && result != nil {
2182-
if tt.expected.Enabled.ValueBool() != result.Enabled.ValueBool() {
2183-
t.Errorf("Enabled mismatch: expected %v, got %v", tt.expected.Enabled.ValueBool(), result.Enabled.ValueBool())
2184-
}
2185-
2186-
if len(tt.expected.SourceIPRanges) != len(result.SourceIPRanges) {
2187-
t.Errorf("SourceIPRanges count mismatch: expected %d, got %d", len(tt.expected.SourceIPRanges), len(result.SourceIPRanges))
2188-
} else {
2189-
for i, expected := range tt.expected.SourceIPRanges {
2190-
if expected.ValueString() != result.SourceIPRanges[i].ValueString() {
2191-
t.Errorf("SourceIPRanges[%d] mismatch: expected '%s', got '%s'", i, expected.ValueString(), result.SourceIPRanges[i].ValueString())
2192-
}
2193-
}
2194-
}
2195-
}
2196-
})
2197-
}
2198-
}
2072+
// func TestMetricsEndpointToSDK(t *testing.T) {
2073+
// t.Skip("metrics_endpoint temporarily removed from schema")
2074+
// tests := []struct {
2075+
// name string
2076+
// input *AWSEnvMetricsEndpointModel
2077+
// expected *sdk.MetricsEndpointSpecInput
2078+
// }{
2079+
// {
2080+
// name: "Nil input",
2081+
// input: nil,
2082+
// expected: nil,
2083+
// },
2084+
// {
2085+
// name: "Complete metrics endpoint config",
2086+
// input: &AWSEnvMetricsEndpointModel{
2087+
// Enabled: types.BoolValue(true),
2088+
// SourceIPRanges: []types.String{types.StringValue("10.0.0.0/8"), types.StringValue("192.168.1.0/24")},
2089+
// },
2090+
// expected: &sdk.MetricsEndpointSpecInput{
2091+
// Enabled: &[]bool{true}[0],
2092+
// SourceIPRanges: []string{"10.0.0.0/8", "192.168.1.0/24"},
2093+
// },
2094+
// },
2095+
// {
2096+
// name: "Metrics endpoint disabled with empty source IP ranges",
2097+
// input: &AWSEnvMetricsEndpointModel{
2098+
// Enabled: types.BoolValue(false),
2099+
// SourceIPRanges: []types.String{},
2100+
// },
2101+
// expected: &sdk.MetricsEndpointSpecInput{
2102+
// Enabled: &[]bool{false}[0],
2103+
// SourceIPRanges: nil,
2104+
// },
2105+
// },
2106+
// }
2107+
2108+
// for _, tt := range tests {
2109+
// t.Run(tt.name, func(t *testing.T) {
2110+
// result := metricsEndpointToSDK(tt.input)
2111+
2112+
// if (tt.expected == nil) != (result == nil) {
2113+
// t.Errorf("Expected nil: %v, got nil: %v", tt.expected == nil, result == nil)
2114+
// return
2115+
// }
2116+
2117+
// if tt.expected != nil && result != nil {
2118+
// if *tt.expected.Enabled != *result.Enabled {
2119+
// t.Errorf("Enabled mismatch: expected %v, got %v", *tt.expected.Enabled, *result.Enabled)
2120+
// }
2121+
2122+
// if len(tt.expected.SourceIPRanges) != len(result.SourceIPRanges) {
2123+
// t.Errorf("SourceIPRanges count mismatch: expected %d, got %d", len(tt.expected.SourceIPRanges), len(result.SourceIPRanges))
2124+
// } else {
2125+
// for i, expected := range tt.expected.SourceIPRanges {
2126+
// if expected != result.SourceIPRanges[i] {
2127+
// t.Errorf("SourceIPRanges[%d] mismatch: expected '%s', got '%s'", i, expected, result.SourceIPRanges[i])
2128+
// }
2129+
// }
2130+
// }
2131+
// }
2132+
// })
2133+
// }
2134+
// }
2135+
2136+
// func TestMetricsEndpointToModel(t *testing.T) {
2137+
// t.Skip("metrics_endpoint temporarily removed from schema")
2138+
// tests := []struct {
2139+
// name string
2140+
// input *sdk.AWSEnvSpecFragment_MetricsEndpoint
2141+
// expected *AWSEnvMetricsEndpointModel
2142+
// }{
2143+
// {
2144+
// name: "Nil input",
2145+
// input: nil,
2146+
// expected: nil,
2147+
// },
2148+
// {
2149+
// name: "Complete metrics endpoint response",
2150+
// input: &sdk.AWSEnvSpecFragment_MetricsEndpoint{
2151+
// Enabled: true,
2152+
// SourceIPRanges: []string{"10.0.0.0/8", "172.16.0.0/12"},
2153+
// },
2154+
// expected: &AWSEnvMetricsEndpointModel{
2155+
// Enabled: types.BoolValue(true),
2156+
// SourceIPRanges: []types.String{types.StringValue("10.0.0.0/8"), types.StringValue("172.16.0.0/12")},
2157+
// },
2158+
// },
2159+
// {
2160+
// name: "Metrics endpoint disabled with empty source IP ranges",
2161+
// input: &sdk.AWSEnvSpecFragment_MetricsEndpoint{
2162+
// Enabled: false,
2163+
// SourceIPRanges: []string{},
2164+
// },
2165+
// expected: &AWSEnvMetricsEndpointModel{
2166+
// Enabled: types.BoolValue(false),
2167+
// SourceIPRanges: nil,
2168+
// },
2169+
// },
2170+
// }
2171+
2172+
// for _, tt := range tests {
2173+
// t.Run(tt.name, func(t *testing.T) {
2174+
// result := metricsEndpointToModel(tt.input)
2175+
2176+
// if (tt.expected == nil) != (result == nil) {
2177+
// t.Errorf("Expected nil: %v, got nil: %v", tt.expected == nil, result == nil)
2178+
// return
2179+
// }
2180+
2181+
// if tt.expected != nil && result != nil {
2182+
// if tt.expected.Enabled.ValueBool() != result.Enabled.ValueBool() {
2183+
// t.Errorf("Enabled mismatch: expected %v, got %v", tt.expected.Enabled.ValueBool(), result.Enabled.ValueBool())
2184+
// }
2185+
2186+
// if len(tt.expected.SourceIPRanges) != len(result.SourceIPRanges) {
2187+
// t.Errorf("SourceIPRanges count mismatch: expected %d, got %d", len(tt.expected.SourceIPRanges), len(result.SourceIPRanges))
2188+
// } else {
2189+
// for i, expected := range tt.expected.SourceIPRanges {
2190+
// if expected.ValueString() != result.SourceIPRanges[i].ValueString() {
2191+
// t.Errorf("SourceIPRanges[%d] mismatch: expected '%s', got '%s'", i, expected.ValueString(), result.SourceIPRanges[i].ValueString())
2192+
// }
2193+
// }
2194+
// }
2195+
// }
2196+
// })
2197+
// }
2198+
// }

0 commit comments

Comments
 (0)