fixed linting issues of avmc

Author: ab-cs13

examples/odb/autonomous_vm_cluster.tf

@@ -1,26 +1,27 @@
-# Copyright © 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
 
 # Autonomous VM Cluster with default maintenance window and minimum parameters
 resource "aws_odb_cloud_autonomous_vm_cluster" "avmc_with_minimum_parameters" {
   cloud_exadata_infrastructure_id       = "<exadata_infra_id>" # refer your exadata infra id
-  odb_network_id                        = "<odb_net_id>" # refer_your_odb_net_id
+  odb_network_id                        = "<odb_net_id>"       # refer_your_odb_net_id
   display_name                          = "Ofake-avmc-my_avmc"
   autonomous_data_storage_size_in_tbs   = 5
   memory_per_oracle_compute_unit_in_gbs = 2
   total_container_databases             = 1
   cpu_core_count_per_node               = 40
   license_model                         = "LICENSE_INCLUDED"
   # ids of db server. refer your exa infra. This is a manadatory fileld. Refer your cloud exadata infrastructure for db server id
-  db_servers                            = ["<my_db_server_id>"]
-  scan_listener_port_tls                = 8561
-  scan_listener_port_non_tls            = 1024
+  db_servers                 = ["<my_db_server_id>"]
+  scan_listener_port_tls     = 8561
+  scan_listener_port_non_tls = 1024
   maintenance_window = {
-    preference          = "NO_PREFERENCE"
-    days_of_week        = []
-    hours_of_day        = []
-    months              = []
-    weeks_of_month      = []
-    lead_time_in_weeks  = 0
+    preference         = "NO_PREFERENCE"
+    days_of_week       = []
+    hours_of_day       = []
+    months             = []
+    weeks_of_month     = []
+    lead_time_in_weeks = 0
   }
 
 }
@@ -41,12 +42,12 @@ resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
   scan_listener_port_tls                = 8561
   scan_listener_port_non_tls            = 1024
   maintenance_window = {
-    preference          = "CUSTOM_PREFERENCE"
-    days_of_week        = ["MONDAY", "TUESDAY"]
-    hours_of_day        = [4, 16]
-    months              = ["FEBRUARY", "MAY", "AUGUST", "NOVEMBER"]
-    weeks_of_month      = [2, 4]
-    lead_time_in_weeks  = 3
+    preference         = "CUSTOM_PREFERENCE"
+    days_of_week       = ["MONDAY", "TUESDAY"]
+    hours_of_day       = [4, 16]
+    months             = ["FEBRUARY", "MAY", "AUGUST", "NOVEMBER"]
+    weeks_of_month     = [2, 4]
+    lead_time_in_weeks = 3
   }
   tags = {
     "env" = "dev"

internal/service/odb/cloud_autonomous_vm_cluster.go

@@ -1,26 +1,26 @@
-// Copyright © 2025, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 
 package odb
 
 import (
 	"context"
 	"errors"
-	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
-	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/odb"
 	odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types"
 	"github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts"
+	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
+	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
-	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/float64planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
@@ -509,10 +509,6 @@ func (r *resourceCloudAutonomousVmCluster) Delete(ctx context.Context, req resou
 	}
 }
 
-func (r *resourceCloudAutonomousVmCluster) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	resource.ImportStatePassthroughID(ctx, path.Root(names.AttrID), req, resp)
-}
-
 func waitCloudAutonomousVmClusterCreated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudAutonomousVmCluster, error) {
 	stateConf := &retry.StateChangeConf{
 		Pending: enum.Slice(odbtypes.ResourceStatusProvisioning),

internal/service/odb/cloud_autonomous_vm_cluster_data_source.go

@@ -1,4 +1,5 @@
-//Copyright © 2025, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 
 package odb
 

internal/service/odb/cloud_autonomous_vm_cluster_data_source_test.go

@@ -1,4 +1,5 @@
-//Copyright © 2025, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 
 package odb_test
 
@@ -86,11 +87,8 @@ func (autonomousVMClusterDSTest) testAccCheckCloudAutonomousVmClusterDestroy(ctx
 }
 func (autonomousVMClusterDSTest) testAccPreCheck(ctx context.Context, t *testing.T) {
 	conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx)
-
-	input := &odb.ListCloudAutonomousVmClustersInput{}
-
-	_, err := conn.ListCloudAutonomousVmClusters(ctx, input)
-
+	input := odb.ListCloudAutonomousVmClustersInput{}
+	_, err := conn.ListCloudAutonomousVmClusters(ctx, &input)
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)
 	}
@@ -103,9 +101,10 @@ func (autonomousVMClusterDSTest) avmcBasic() string {
 	exaInfraDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.exaInfraDisplayNamePrefix)
 	odbNetworkDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.odbNetDisplayNamePrefix)
 	avmcDisplayName := sdkacctest.RandomWithPrefix(autonomousVMClusterDSTestEntity.autonomousVmClusterDisplayNamePrefix)
-
-	exaInfraRes := autonomousVMClusterDSTestEntity.exaInfra(exaInfraDisplayName)
-	odbNetRes := autonomousVMClusterDSTestEntity.odbNet(odbNetworkDisplayName)
+	domain := acctest.RandomDomainName()
+	emailAddress := acctest.RandomEmailAddress(domain)
+	exaInfraRes := autonomousVMClusterDSTestEntity.exaInfra(exaInfraDisplayName, emailAddress)
+	odbNetRes := autonomousVMClusterDSTestEntity.oracleDBNetwork(odbNetworkDisplayName)
 	res := fmt.Sprintf(`
 %s
 
@@ -116,79 +115,83 @@ data "aws_odb_db_servers_list" "test" {
 }
 
 resource "aws_odb_cloud_autonomous_vm_cluster" "test" {
-    cloud_exadata_infrastructure_id         = aws_odb_cloud_exadata_infrastructure.test.id
-  	odb_network_id                          =aws_odb_network.test.id
-	display_name             				= %[3]q
-  	autonomous_data_storage_size_in_tbs     = 5
-  	memory_per_oracle_compute_unit_in_gbs   = 2
-  	total_container_databases               = 1
-  	cpu_core_count_per_node                 = 40
-    license_model                                = "LICENSE_INCLUDED"
-    db_servers								   = [ for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
-    scan_listener_port_tls = 8561
-    scan_listener_port_non_tls = 1024
-    maintenance_window = {
-		 preference = "NO_PREFERENCE"
-		 days_of_week =	[]
-         hours_of_day =	[]
-         months = []
-         weeks_of_month =[]
-         lead_time_in_weeks = 0
-    }
+  cloud_exadata_infrastructure_id       = aws_odb_cloud_exadata_infrastructure.test.id
+  odb_network_id                        = aws_odb_network.test.id
+  display_name                          = %[3]q
+  autonomous_data_storage_size_in_tbs   = 5
+  memory_per_oracle_compute_unit_in_gbs = 2
+  total_container_databases             = 1
+  cpu_core_count_per_node               = 40
+  license_model                         = "LICENSE_INCLUDED"
+  db_servers                            = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
+  scan_listener_port_tls                = 8561
+  scan_listener_port_non_tls            = 1024
+  maintenance_window {
+    custom_action_timeout_in_mins    = 16
+    is_custom_action_timeout_enabled = true
+    patching_mode                    = "ROLLING"
+    preference                       = "NO_PREFERENCE"
+  }
 
 }
 
 
 data "aws_odb_cloud_autonomous_vm_cluster" "test" {
-  id             = aws_odb_cloud_autonomous_vm_cluster.test.id
+  id = aws_odb_cloud_autonomous_vm_cluster.test.id
 
 }
 `, exaInfraRes, odbNetRes, avmcDisplayName)
 
 	return res
 }
 
-func (autonomousVMClusterDSTest) odbNet(odbNetName string) string {
+func (autonomousVMClusterDSTest) oracleDBNetwork(odbNetName string) string {
 	networkRes := fmt.Sprintf(`
 
 
+
+
 resource "aws_odb_network" "test" {
-  display_name          = %[1]q
+  display_name         = %[1]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"
+  s3_access            = "DISABLED"
+  zero_etl_access      = "DISABLED"
 }
 
+
 `, odbNetName)
 	return networkRes
 }
 
-func (autonomousVMClusterDSTest) exaInfra(exaInfraName string) string {
+func (autonomousVMClusterDSTest) exaInfra(exaInfraName, emailAddress string) string {
 	exaInfraRes := fmt.Sprintf(`
 
 
+
+
 resource "aws_odb_cloud_exadata_infrastructure" "test" {
-  display_name          = %[1]q
-  shape             	= "Exadata.X9M"
-  storage_count      	= 3
-  compute_count         = 2
-  availability_zone_id 	= "use1-az6"
-  customer_contacts_to_send_to_oci = ["[email protected]"]
-maintenance_window = {
-  		custom_action_timeout_in_mins = 16
-		days_of_week =	[]
-        hours_of_day =	[]
-        is_custom_action_timeout_enabled = true
-        lead_time_in_weeks = 0
-        months = []
-        patching_mode = "ROLLING"
-        preference = "NO_PREFERENCE"
-		weeks_of_month =[]
+  display_name                     = %[1]q
+  shape                            = "Exadata.X9M"
+  storage_count                    = 3
+  compute_count                    = 2
+  availability_zone_id             = "use1-az6"
+  customer_contacts_to_send_to_oci = ["%[2]s"]
+  maintenance_window = {
+    custom_action_timeout_in_mins    = 16
+    days_of_week                     = []
+    hours_of_day                     = []
+    is_custom_action_timeout_enabled = true
+    lead_time_in_weeks               = 0
+    months                           = []
+    patching_mode                    = "ROLLING"
+    preference                       = "NO_PREFERENCE"
+    weeks_of_month                   = []
   }
 }
 
-`, exaInfraName)
+
+`, exaInfraName, emailAddress)
 	return exaInfraRes
 }