Merge branch 'main' into f-provider-meta-simple

Author: jar-b

.changelog/45509.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_odb_network_peering_connection: Add network peering creation using `odb_network_arn` for resource sharing model.
+```

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 6.26.0 (Unreleased)
+## 6.26.0 (December 10, 2025)
 
 FEATURES:
 
@@ -19,6 +19,7 @@ ENHANCEMENTS:
 * resource/aws_kinesisanalyticsv2_application: Add `application_configuration.application_encryption_configuration` argument ([#45356](https://github.com/hashicorp/terraform-provider-aws/issues/45356))
 * resource/aws_kinesisanalyticsv2_application: Support `FLINK-1_20` as a valid value for `runtime_environment` ([#45356](https://github.com/hashicorp/terraform-provider-aws/issues/45356))
 * resource/aws_lambda_capacity_provider: Add resource identity support ([#45456](https://github.com/hashicorp/terraform-provider-aws/issues/45456))
+* resource/aws_odb_network_peering_connection: Add network peering creation using `odb_network_arn` for resource sharing model. ([#45509](https://github.com/hashicorp/terraform-provider-aws/issues/45509))
 * resource/aws_rds_cluster: Add `upgrade_rollout_order` attribute ([#45527](https://github.com/hashicorp/terraform-provider-aws/issues/45527))
 * resource/aws_s3vectors_index: Add `encryption_configuration` block ([#45470](https://github.com/hashicorp/terraform-provider-aws/issues/45470))
 * resource/aws_s3vectors_index: Add `metadata_configuration` block ([#45470](https://github.com/hashicorp/terraform-provider-aws/issues/45470))

internal/service/odb/network_peering_connection.go

@@ -68,9 +68,11 @@ func (r *resourceNetworkPeeringConnection) Schema(ctx context.Context, req resou
 			names.AttrARN: framework.ARNAttributeComputedOnly(),
 			names.AttrID:  framework.IDAttribute(),
 			"odb_network_id": schema.StringAttribute{
-				Required: true,
+				Optional: true,
+				Computed: true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.RequiresReplace(),
+					stringplanmodifier.UseStateForUnknown(),
 				},
 				Description: "Required field. The unique identifier of the ODB network that initiates the peering connection. " +
 					"A sample ID is odbpcx-abcdefgh12345678. Changing this will force terraform to create new resource.",
@@ -109,8 +111,10 @@ func (r *resourceNetworkPeeringConnection) Schema(ctx context.Context, req resou
 
 			"odb_network_arn": schema.StringAttribute{
 				Description: "ARN of the odb network peering connection.",
+				Optional:    true,
 				Computed:    true,
 				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplaceIfConfigured(),
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
@@ -157,15 +161,49 @@ func (r *resourceNetworkPeeringConnection) Schema(ctx context.Context, req resou
 	}
 }
 
+func (r *resourceNetworkPeeringConnection) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) {
+	var data odbNetworkPeeringConnectionResourceModel
+	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	//Neither is present
+	if data.OdbNetworkId.IsNull() && data.OdbNetworkArn.IsNull() {
+		err := errors.New("either odb_network_id or odb_network_arn must be present. Neither is present.")
+		resp.Diagnostics.AddError(
+			create.ProblemStandardMessage(names.ODB, create.ErrActionCreating, ResNameNetworkPeeringConnection, data.DisplayName.String(), err),
+			err.Error(),
+		)
+		return
+	}
+
+	//Both are present
+	if !data.OdbNetworkId.IsNull() && !data.OdbNetworkArn.IsNull() {
+		err := errors.New("either odb_network_id or odb_network_arn must be present. Both are present.")
+		resp.Diagnostics.AddError(
+			create.ProblemStandardMessage(names.ODB, create.ErrActionCreating, ResNameNetworkPeeringConnection, data.DisplayName.String(), err),
+			err.Error(),
+		)
+		return
+	}
+}
+
 func (r *resourceNetworkPeeringConnection) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
 	conn := r.Meta().ODBClient(ctx)
 	var plan odbNetworkPeeringConnectionResourceModel
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
+
+	odbNetwork := plan.OdbNetworkArn
+	if odbNetwork.IsNull() || odbNetwork.IsUnknown() {
+		odbNetwork = plan.OdbNetworkId
+	}
+
 	input := odb.CreateOdbPeeringConnectionInput{
-		OdbNetworkId:  plan.OdbNetworkId.ValueStringPointer(),
+		OdbNetworkId:  odbNetwork.ValueStringPointer(),
 		PeerNetworkId: plan.PeerNetworkId.ValueStringPointer(),
 		DisplayName:   plan.DisplayName.ValueStringPointer(),
 		Tags:          getTagsIn(ctx),

internal/service/odb/network_peering_connection_test.go

@@ -75,6 +75,74 @@ func TestAccODBNetworkPeeringConnection_basic(t *testing.T) {
 	})
 }
 
+func TestAccODBNetworkPeeringConnection_withARN(t *testing.T) {
+	ctx := acctest.Context(t)
+
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
+	var odbPeeringResource odb.GetOdbPeeringConnectionOutput
+	odbPeeringDisplayName := sdkacctest.RandomWithPrefix(oracleDBNwkPeeringTestResource.odbPeeringDisplayNamePrefix)
+	vpcName := sdkacctest.RandomWithPrefix(oracleDBNwkPeeringTestResource.vpcNamePrefix)
+	odbNetName := sdkacctest.RandomWithPrefix(oracleDBNwkPeeringTestResource.odbNwkDisplayNamePrefix)
+	resourceName := "aws_odb_network_peering_connection.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.PreCheck(ctx, t)
+			oracleDBNwkPeeringTestResource.testAccPreCheck(ctx, t)
+		},
+		ErrorCheck:               acctest.ErrorCheck(t, names.ODBServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             oracleDBNwkPeeringTestResource.testAccCheckNetworkPeeringConnectionDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: oracleDBNwkPeeringTestResource.basicConfigWithARN(vpcName, odbNetName, odbPeeringDisplayName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckNetworkPeeringConnectionExists(ctx, resourceName, &odbPeeringResource),
+					resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
+					resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccODBNetworkPeeringConnection_variables(t *testing.T) {
+	ctx := acctest.Context(t)
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
+	odbPeeringDisplayName := sdkacctest.RandomWithPrefix(oracleDBNwkPeeringTestResource.odbPeeringDisplayNamePrefix)
+	vpcName := sdkacctest.RandomWithPrefix(oracleDBNwkPeeringTestResource.vpcNamePrefix)
+	odbNetName := sdkacctest.RandomWithPrefix(oracleDBNwkPeeringTestResource.odbNwkDisplayNamePrefix)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.PreCheck(ctx, t)
+			vmClusterTestEntity.testAccPreCheck(ctx, t)
+		},
+		ErrorCheck:               acctest.ErrorCheck(t, names.ODBServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             oracleDBNwkPeeringTestResource.testAccCheckNetworkPeeringConnectionDestroy(ctx),
+		Steps: []resource.TestStep{
+			// nosemgrep:ci.semgrep.acctest.checks.replace-planonly-checks
+			{
+				Config:             oracleDBNwkPeeringTestResource.basicConfig_useVariables(vpcName, odbNetName, odbPeeringDisplayName),
+				PlanOnly:           true,
+				ExpectNonEmptyPlan: true,
+			},
+		},
+	})
+}
+
 func TestAccODBNetworkPeeringConnection_tagging(t *testing.T) {
 	ctx := acctest.Context(t)
 
@@ -260,6 +328,62 @@ resource "aws_odb_network_peering_connection" "test" {
 `, vpcName, odbNetName, odbPeeringName)
 }
 
+func (oracleDBNwkPeeringResourceTest) basicConfig_useVariables(vpcName, odbNetName, odbPeeringName string) string {
+	return fmt.Sprintf(`
+resource "aws_vpc" "test" {
+  cidr_block = "10.0.0.0/16"
+  tags = {
+    Name = %[1]q
+  }
+}
+
+variable odb_network_id {
+  default     = "odbnet_3l9st3litg"
+  type        = string
+  description = "ODB Network"
+}
+
+resource "aws_odb_network_peering_connection" "test" {
+  display_name    = %[3]q
+  odb_network_id  = var.odb_network_id
+  peer_network_id = aws_vpc.test.id
+  tags = {
+    "env" = "dev"
+  }
+}
+`, vpcName, odbNetName, odbPeeringName)
+}
+
+func (oracleDBNwkPeeringResourceTest) basicConfigWithARN(vpcName, odbNetName, odbPeeringName string) string {
+	return fmt.Sprintf(`
+
+resource "aws_vpc" "test" {
+  cidr_block = "10.0.0.0/16"
+  tags = {
+    Name = %[1]q
+  }
+}
+
+resource "aws_odb_network" "test" {
+  display_name         = %[2]q
+  availability_zone_id = "use1-az6"
+  client_subnet_cidr   = "10.2.0.0/24"
+  backup_subnet_cidr   = "10.2.1.0/24"
+  s3_access            = "DISABLED"
+  zero_etl_access      = "DISABLED"
+}
+
+resource "aws_odb_network_peering_connection" "test" {
+  display_name    = %[3]q
+  odb_network_id  = aws_odb_network.test.arn
+  peer_network_id = aws_vpc.test.id
+  tags = {
+    "env" = "dev"
+  }
+}
+`, vpcName, odbNetName, odbPeeringName)
+}
+
 func (oracleDBNwkPeeringResourceTest) basicConfigNoTag(vpcName, odbNetName, odbPeeringName string) string {
 	return fmt.Sprintf(`
 resource "aws_vpc" "test" {

internal/service/ssm/parameter_list_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
+// Copyright IBM Corp. 2014, 2025
 // SPDX-License-Identifier: MPL-2.0
 
 package ssm_test

version/VERSION

@@ -1 +1 @@
-6.25.1
+6.26.0

website/docs/r/odb_network_peering_connection.html.markdown

@@ -8,7 +8,7 @@ description: |-
 
 # Resource: aws_odb_network_peering_connection
 
-Terraform  resource for managing oracle database network peering resource in AWS.
+Terraform  resource for managing oracle database network peering resource in AWS. If underlying odb network is shared, ARN must be used while creating network peering.
 
 You can find out more about Oracle Database@AWS from [User Guide](https://docs.aws.amazon.com/odb/latest/UserGuide/what-is-odb.html).
 
@@ -31,12 +31,13 @@ resource "aws_odb_network_peering_connection" "example" {
 
 The following arguments are required:
 
-* `odb_network_id` - (Required) The unique identifier of the ODB network that initiates the peering connection. A sample ID is `odbpcx-abcdefgh12345678`. Changing this will force Terraform to create a new resource.
-* `peer_network_id` - (Required) The unique identifier of the ODB peering connection. Changing this will force Terraform to create a new resource.
+* `peer_network_id` - (Required) The unique identifier of the ODB peering connection. Changing this will force Terraform to create a new resource. Either odb_network_id or odb_network_arn should be used.
 * `display_name` - (Required) Display name of the ODB network peering connection. Changing this will force Terraform to create a new resource.
 
 The following arguments are optional:
 
+* `odb_network_id` - (Optional) The unique identifier of the ODB network that initiates the peering connection. A sample ID is `odbpcx-abcdefgh12345678`. Changing this will force Terraform to create a new resource.
+* `odb_network_arn` - (Optional) ARN of the ODB network that initiates the peering connection. Changing this will force Terraform to create a new resource. Either odb_network_id or odb_network_arn should be used.
 * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference).
 * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level.
 
@@ -47,7 +48,6 @@ This data source exports the following attributes in addition to the arguments a
 * `id` - Unique identifier of odb network peering connection.
 * `status` - Status of the ODB network peering connection.
 * `status_reason` - The reason for the current status of the ODB peering connection.
-* `odb_network_arn` - ARN of the ODB network peering connection.
 * `peer_network_arn` - ARN of the peer network peering connection.
 * `odb_peering_connection_type` - Type of the ODB peering connection.
 * `created_at` - Created time of the ODB network peering connection.