Merge branch 'master' into newipamfed2

infobloxopen · Sep 19, 2024 · 560670f · 560670f
2 parents 7d06aeb + 39c6550
commit 560670f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,4 +42,3 @@ internal/service/*/.openapi-generator-ignore
 
 # Ignore the metadata files
 **/.DS_Store
-
diff --git a/internal/service/ipam/model_ipamsvc_address_block.go b/internal/service/ipam/model_ipamsvc_address_block.go
@@ -292,6 +292,7 @@ var IpamsvcAddressBlockResourceSchemaAttributes = map[string]schema.Attribute{
 	"federated_realms": schema.ListAttribute{
 		ElementType:         types.StringType,
 		Optional:            true,
+		Computed:            true,
 		MarkdownDescription: "Federated realms to which this address block belongs.",
 	},
 	"header_option_filename": schema.StringAttribute{
@@ -536,7 +537,7 @@ func (m *IpamsvcAddressBlockModel) Flatten(ctx context.Context, from *ipam.Addre
 	m.DiscoveryAttrs = flex.FlattenFrameworkMapString(ctx, from.DiscoveryAttrs, diags)
 	m.DiscoveryMetadata = flex.FlattenFrameworkMapString(ctx, from.DiscoveryMetadata, diags)
 	m.ExternalKeys = flex.FlattenFrameworkMapString(ctx, from.ExternalKeys, diags)
-	m.FederatedRealms = flex.FlattenFrameworkListString(ctx, from.FederatedRealms, diags)
+	m.FederatedRealms = flex.FlattenFrameworkListStringNotNull(ctx, from.FederatedRealms, diags)
 	m.HeaderOptionFilename = flex.FlattenStringPointer(from.HeaderOptionFilename)
 	m.HeaderOptionServerAddress = flex.FlattenStringPointer(from.HeaderOptionServerAddress)
 	m.HeaderOptionServerName = flex.FlattenStringPointer(from.HeaderOptionServerName)

diff --git a/internal/service/ipam/model_ipamsvc_subnet.go b/internal/service/ipam/model_ipamsvc_subnet.go
@@ -322,6 +322,7 @@ var IpamsvcSubnetResourceSchemaAttributes = map[string]schema.Attribute{
 	"federated_realms": schema.ListAttribute{
 		ElementType:         types.StringType,
 		Optional:            true,
+		Computed:            true,
 		MarkdownDescription: "Federated realms to which this subnet belongs.",
 	},
 	"header_option_filename": schema.StringAttribute{
@@ -570,7 +571,7 @@ func (m *IpamsvcSubnetModel) Flatten(ctx context.Context, from *ipam.Subnet, dia
 	m.DiscoveryAttrs = flex.FlattenFrameworkMapString(ctx, from.DiscoveryAttrs, diags)
 	m.DiscoveryMetadata = flex.FlattenFrameworkMapString(ctx, from.DiscoveryMetadata, diags)
 	m.ExternalKeys = flex.FlattenFrameworkMapString(ctx, from.ExternalKeys, diags)
-	m.FederatedRealms = flex.FlattenFrameworkListString(ctx, from.FederatedRealms, diags)
+	m.FederatedRealms = flex.FlattenFrameworkListStringNotNull(ctx, from.FederatedRealms, diags)
 	m.HeaderOptionFilename = flex.FlattenStringPointer(from.HeaderOptionFilename)
 	m.HeaderOptionServerAddress = flex.FlattenStringPointer(from.HeaderOptionServerAddress)
 	m.HeaderOptionServerName = flex.FlattenStringPointer(from.HeaderOptionServerName)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,3 @@ internal/service/*/.openapi-generator-ignore

		# Ignore the metadata files
		**/.DS_Store