Merge pull request #639 from duplocloud/release/0.10.39

Release v0.10.39
duplocloud · Aug 26, 2024 · db0d558 · db0d558
2 parents 17dcb47 + 3409b99
commit db0d558
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ NAMESPACE=duplocloud
 
 NAME=duplocloud
 BINARY=terraform-provider-${NAME}
-VERSION=0.10.38
+VERSION=0.10.39
 #mac
 #OS_ARCH=darwin_amd64
 #OS_ARCH=linux_amd64

diff --git a/docs/resources/rds_instance.md b/docs/resources/rds_instance.md
@@ -104,7 +104,7 @@ If you don't know the available engine versions for your RDS instance, you can u
 - `parameter_group_name` (String) A RDS parameter group name to apply to the RDS instance.
 - `skip_final_snapshot` (Boolean) If the final snapshot should be taken. When set to true, the final snapshot will not be taken when the resource is deleted. Defaults to `false`.
 - `snapshot_id` (String) A database snapshot to initialize the RDS instance from, at launch.
-- `storage_type` (String) Valid values: gp2 | gp3 | io1 | standard. Storage type to be used for RDS instance storage.
+- `storage_type` (String) Valid values: gp2 | gp3 | io1 | standard | aurora. Storage type to be used for RDS instance storage.
 - `store_details_in_secret_manager` (Boolean) Whether or not to store RDS details in the AWS secrets manager.
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `v2_scaling_configuration` (Block List, Max: 1) Serverless v2_scaling_configuration min and max scalling capacity. (see [below for nested schema](#nestedblock--v2_scaling_configuration))

diff --git a/docs/resources/s3_bucket.md b/docs/resources/s3_bucket.md
@@ -75,7 +75,7 @@ resource "duplocloud_s3_bucket" "mydata" {
 - `managed_policies` (List of String) Duplo can manage your S3 bucket policy for you, based on simple list of policy keywords:
 
  - `"ssl"`: Require SSL / HTTPS when accessing the bucket.
- - `"ignore"`: If this key is present, Duplo will not manage your bucket policy.
+ - `"ignore"`: If this value is present, Duplo will not manage your bucket policy.
 - `region` (String) The region of the S3 bucket.
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 

diff --git a/duplocloud/resource_duplo_aws_dynamodb_table_v2.go b/duplocloud/resource_duplo_aws_dynamodb_table_v2.go
@@ -322,14 +322,18 @@ func resourceAwsDynamoDBTableReadV2(ctx context.Context, d *schema.ResourceData,
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	var fullName string
 	log.Printf("[TRACE] resourceAwsDynamoDBTableReadV2(%s, %s): start", tenantID, name)
-	reservedFullname := d.Get("fullname").(string)
 	c := m.(*duplosdk.Client)
+	prefix, err := c.GetDuploServicesPrefix(tenantID)
 
-	var fullName string
-
-	if fullName != reservedFullname && reservedFullname != "" {
-		fullName = reservedFullname
+	if err != nil {
+		return diag.Errorf("Unable to retrieve duplo service name (name: %s, error: %s)", name, err.Error())
+	}
+	if strings.Contains(name, prefix) {
+		fullName = name
+	} else {
+		fullName = prefix + "-" + name
 	}
 	duplo, clientErr := c.DynamoDBTableGetV2(tenantID, fullName)
 	if clientErr != nil {

diff --git a/duplocloud/resource_duplo_rds_instance.go b/duplocloud/resource_duplo_rds_instance.go
@@ -180,12 +180,12 @@ func rdsInstanceSchema() map[string]*schema.Schema {
 			ValidateFunc: validation.StringMatch(regexp.MustCompile(`^db\.`), "RDS instance types must start with 'db.'"),
 		},
 		"storage_type": {
-			Description: "Valid values: gp2 | gp3 | io1 | standard. Storage type to be used for RDS instance storage.",
+			Description: "Valid values: gp2 | gp3 | io1 | standard | aurora. Storage type to be used for RDS instance storage.",
 			Type:        schema.TypeString,
 			Optional:    true,
 			Computed:    true,
 			ValidateFunc: validation.StringInSlice(
-				[]string{"gp2", "gp3", "io1", "standard"},
+				[]string{"gp2", "gp3", "io1", "standard", "aurora"},
 				false,
 			),
 		},

diff --git a/duplocloud/resource_duplo_s3_bucket.go b/duplocloud/resource_duplo_s3_bucket.go
@@ -107,7 +107,7 @@ func s3BucketSchema() map[string]*schema.Schema {
 		"managed_policies": {
 			Description: "Duplo can manage your S3 bucket policy for you, based on simple list of policy keywords:\n\n" +
 				" - `\"ssl\"`: Require SSL / HTTPS when accessing the bucket.\n" +
-				" - `\"ignore\"`: If this key is present, Duplo will not manage your bucket policy.\n",
+				" - `\"ignore\"`: If this value is present, Duplo will not manage your bucket policy.\n",
 			Type:     schema.TypeList,
 			Optional: true,
 			Computed: true,

diff --git a/examples/aws-integration/main.tf b/examples/aws-integration/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
     aws = {

diff --git a/examples/ecs/main.tf b/examples/ecs/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

diff --git a/examples/eks-integration/main.tf b/examples/eks-integration/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
     aws = {

diff --git a/examples/emr/files/emr_auto_scaling/main.tf b/examples/emr/files/emr_auto_scaling/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

diff --git a/examples/emr/files/emr_spot/main.tf b/examples/emr/files/emr_spot/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

diff --git a/examples/emr/main.tf b/examples/emr/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

diff --git a/examples/ephemeral-storage/main.tf b/examples/ephemeral-storage/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

diff --git a/examples/infrastructure/main.tf b/examples/infrastructure/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

diff --git a/examples/k8/main.tf b/examples/k8/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

diff --git a/examples/resources/duplocloud_aws_dynamodb_table_v2/import.sh b/examples/resources/duplocloud_aws_dynamodb_table_v2/import.sh
@@ -2,4 +2,5 @@
 #  - *TENANT_ID* is the tenant GUID
 #  - *NAME* is the name of dynamodb table
 #
-terraform import duplocloud_aws_dynamodb_table_v2.myDynamodbTable *TENANT_ID*/*NAME*
+terraform import duplocloud_aws_dynamodb_table_v2.myDynamodbTable *TENANT_ID*/*NAME*
+
diff --git a/examples/service/main.tf b/examples/service/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     duplocloud = {
-      version = "0.10.38" # RELEASE VERSION
+      version = "0.10.39" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }