Merge pull request #624 from duplocloud/release/0.10.37

Release v0.10.37
duplocloud · Aug 8, 2024 · 3bbe9fa · 3bbe9fa
2 parents e32e965 + 7fc7fe0
commit 3bbe9fa
Show file tree

Hide file tree

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

diff --git a/docs/index.md b/docs/index.md
@@ -26,4 +26,5 @@ provider "duplocloud" {
 
 - `duplo_host` (String) This is the base URL to the Duplo REST API.  It must be provided, but it can also be sourced from the `duplo_host` environment variable.
 - `duplo_token` (String, Sensitive) This is a bearer token used to authenticate to the Duplo REST API.  It must be provided, but it can also be sourced from the `duplo_token` environment variable.
+- `http_timeout` (Number) Timeout for HTTP requests in seconds. Defaults to `30`.
 - `ssl_no_verify` (Boolean) Disable SSL certificate verification. Defaults to `false`.
diff --git a/docs/resources/aws_apigateway_event.md b/docs/resources/aws_apigateway_event.md
@@ -51,6 +51,7 @@ resource "duplocloud_aws_apigateway_event" "apigateway_event" {
 - `api_key_required` (Boolean) Specify if the method requires an API key.
 - `authorization_type` (String) Type of authorization used for the method. (`NONE`, `CUSTOM`, `AWS_IAM`, `COGNITO_USER_POOLS`)
 - `authorizer_id` (String) Authorizer id to be used when the authorization is `CUSTOM` or `COGNITO_USER_POOLS`.
+- `content_handling` (String) How to handle request payload content type conversions. Supported values are `CONVERT_TO_BINARY` and `CONVERT_TO_TEXT`. If this property is not defined, the request payload will be passed through from the method request to integration request without modification, provided that the passthroughBehaviors is configured to support payload pass-through.
 - `cors` (Boolean) Enable handling of preflight requests.
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 

diff --git a/docs/resources/aws_ecr_repository.md b/docs/resources/aws_ecr_repository.md
@@ -45,7 +45,7 @@ resource "duplocloud_aws_ecr_repository" "test-ecr" {
 
 ### Read-Only
 
-- `arn` (String) Full ARN of the repository.
+- `arn` (String) Full ARN of the ECR repository.
 - `id` (String) The ID of this resource.
 - `registry_id` (String) The registry ID where the repository was created.
 - `repository_url` (String) The URL of the repository.

diff --git a/docs/resources/infrastructure_setting.md b/docs/resources/infrastructure_setting.md
@@ -56,6 +56,7 @@ resource "duplocloud_infrastructure_setting" "settings" {
 - `custom_data` (Block List, Deprecated) A complete list of configuration settings for this infrastructure, even ones not being managed by this resource. The custom_data argument is only applied on creation, and is deprecated in favor of the settings argument. (see [below for nested schema](#nestedblock--custom_data))
 - `delete_unspecified_settings` (Boolean) Whether or not this resource should delete any settings not specified by this resource. **WARNING:**  It is not recommended to change the default value of `false`. Defaults to `false`.
 - `setting` (Block List) A list of configuration settings to manage, expressed as key / value pairs.
+
 | Cloud     | Key (string)                 | Value (string)                                          |
 |-----------|------------------------------|---------------------------------------------------------| 
 | All Cloud | MaximumK8sSessionDuration    | int                                                     | 
@@ -73,7 +74,8 @@ resource "duplocloud_infrastructure_setting" "settings" {
 | Azure     | Shared Image Gallery         | string                                                  |
 | Azure     | EnableAzureAppGatewayIngress | bool                                                    |
 | GCP       | GkeMinPortsPerVm             | int                                                     |
-*Note: EksControlplaneLogs value can be set with combination of settings separated by ; with no spaces* (see [below for nested schema](#nestedblock--setting))
+
+Note: EksControlplaneLogs value can be set with combination of settings separated by ; with no spaces (see [below for nested schema](#nestedblock--setting))
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
 ### Read-Only

diff --git a/duplocloud/data_source_duplo_plan_cert.go b/duplocloud/data_source_duplo_plan_cert.go
@@ -82,7 +82,7 @@ func dataSourcePlanCertsRead(ctx context.Context, d *schema.ResourceData, m inte
 	}
 	// Populate the results from the list.
 	d.Set("certificates", flattenPlanCerts(all))
-
+	d.Set("plan_id", planID)
 	d.SetId(planID)
 
 	log.Printf("[TRACE] dataSourcePlanCertsRead(%s): end", planID)
@@ -106,6 +106,7 @@ func dataSourcePlanCertRead(ctx context.Context, d *schema.ResourceData, m inter
 	d.SetId(cert.CertificateArn)
 	d.Set("name", cert.CertificateName)
 	d.Set("arn", cert.CertificateArn)
+	d.Set("plan_id", planID)
 
 	log.Printf("[TRACE] dataSourcePlanCertRead(): end")
 	return nil

diff --git a/duplocloud/provider.go b/duplocloud/provider.go
@@ -4,10 +4,12 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"strings"
 	"terraform-provider-duplocloud/duplosdk"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -49,6 +51,12 @@ func Provider() *schema.Provider {
 				Optional:    true,
 				Default:     false,
 			},
+			"http_timeout": {
+				Description: "Timeout for HTTP requests in seconds.",
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Default:     30,
+			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
 			"duplocloud_oci_containerengine_node_pool":   resourceOciContainerEngineNodePool(),
@@ -262,10 +270,17 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
 	}
 
 	if sslNoVerify, ok := d.GetOk("ssl_no_verify"); ok && sslNoVerify.(bool) {
+		log.Printf("[TRACE] ssl_no_verify provided in the provider configuration.")
 		c.HTTPClient.Transport = &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 		}
 	}
 
+	if httpTimeout, ok := d.GetOk("http_timeout"); ok {
+		timout := time.Duration(httpTimeout.(int)) * time.Second
+		log.Printf("[TRACE] http_timeout provided in the provider configuration. Timeout : %s", timout)
+		c.HTTPClient.Timeout = timout * time.Second
+	}
+
 	return c, diags
 }
diff --git a/duplocloud/resource_duplo_aws_apigateway_event.go b/duplocloud/resource_duplo_aws_apigateway_event.go
@@ -80,6 +80,16 @@ func AwsApiGatewayEventSchema() map[string]*schema.Schema {
 				"COGNITO_USER_POOLS",
 			}, false),
 		},
+		"content_handling": {
+			Description: "How to handle request payload content type conversions. Supported values are `CONVERT_TO_BINARY` and `CONVERT_TO_TEXT`. If this property is not defined, the request payload will be passed through from the method request to integration request without modification, provided that the passthroughBehaviors is configured to support payload pass-through.",
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			ValidateFunc: validation.StringInSlice([]string{
+				"CONVERT_TO_TEXT",
+				"CONVERT_TO_BINARY",
+			}, false),
+		},
 		"integration": {
 			Description: "Specify API gateway integration.",
 			Type:        schema.TypeList,
@@ -165,6 +175,7 @@ func resourceAwsApiGatewayEventRead(ctx context.Context, d *schema.ResourceData,
 	d.Set("api_key_required", duplo.ApiKeyRequired)
 	d.Set("authorizer_id", duplo.AuthorizerId)
 	d.Set("authorization_type", duplo.AuthorizationType)
+	d.Set("content_handling", duplo.ContentHandling)
 	if duplo.Integration != nil {
 		d.Set("integration", []interface{}{
 			map[string]interface{}{
@@ -203,6 +214,9 @@ func resourceAwsApiGatewayEventCreate(ctx context.Context, d *schema.ResourceDat
 	if v, ok := d.GetOk("authorization_type"); ok && v != nil {
 		rq.AuthorizationType = v.(string)
 	}
+	if v, ok := d.GetOk("content_handling"); ok && v != nil {
+		rq.ContentHandling = v.(string)
+	}
 	if v, ok := d.GetOk("integration"); ok {
 		if s := v.([]interface{}); len(s) > 0 {
 			rq.Integration = expandAwsApiGatewayEventIntegration(s[0].(map[string]interface{}))
@@ -256,6 +270,9 @@ func resourceAwsApiGatewayEventUpdate(ctx context.Context, d *schema.ResourceDat
 	if v, ok := d.GetOk("authorization_type"); ok && v != nil {
 		rq.AuthorizationType = v.(string)
 	}
+	if v, ok := d.GetOk("content_handling"); ok && v != nil {
+		rq.ContentHandling = v.(string)
+	}
 	if v, ok := d.GetOk("integration"); ok {
 		if s := v.([]interface{}); len(s) > 0 {
 			rq.Integration = expandAwsApiGatewayEventIntegration(s[0].(map[string]interface{}))

diff --git a/duplocloud/resource_duplo_aws_ecr_repository.go b/duplocloud/resource_duplo_aws_ecr_repository.go
@@ -29,7 +29,7 @@ func duploAwsEcrRepositorySchema() map[string]*schema.Schema {
 			ForceNew:    true,
 		},
 		"arn": {
-			Description: "Full ARN of the repository.",
+			Description: "Full ARN of the ECR repository.",
 			Type:        schema.TypeString,
 			Computed:    true,
 		},

diff --git a/duplocloud/resource_duplo_infrastructure_setting.go b/duplocloud/resource_duplo_infrastructure_setting.go
@@ -39,6 +39,7 @@ func resourceInfrastructureSetting() *schema.Resource {
 			},
 			"setting": {
 				Description: `A list of configuration settings to manage, expressed as key / value pairs.
+				
 | Cloud     | Key (string)                 | Value (string)                                          |
 |-----------|------------------------------|---------------------------------------------------------| 
 | All Cloud | MaximumK8sSessionDuration    | int                                                     | 
@@ -56,7 +57,8 @@ func resourceInfrastructureSetting() *schema.Resource {
 | Azure     | Shared Image Gallery         | string                                                  |
 | Azure     | EnableAzureAppGatewayIngress | bool                                                    |
 | GCP       | GkeMinPortsPerVm             | int                                                     |
-*Note: EksControlplaneLogs value can be set with combination of settings separated by ; with no spaces*`,
+
+Note: EksControlplaneLogs value can be set with combination of settings separated by ; with no spaces`,
 				Type:          schema.TypeList,
 				Optional:      true,
 				Elem:          KeyValueSchema(),

diff --git a/duplocloud/resource_duplo_plan_certificates.go b/duplocloud/resource_duplo_plan_certificates.go
@@ -114,7 +114,7 @@ func resourcePlanCertificatesRead(ctx context.Context, d *schema.ResourceData, m
 
 	// Set the simple fields first.
 	d.Set("certificates", flattenPlanCertificates(duplo))
-
+	d.Set("plan_id", planID)
 	// Build a list of current state, to replace the user-supplied settings.
 	if v, ok := getAsStringArray(d, "specified_certificates"); ok && v != nil {
 		d.Set("certificate", flattenPlanCertificates(selectPlanCertificates(duplo, *v)))

diff --git a/duplosdk/aws_apigateway_events.go b/duplosdk/aws_apigateway_events.go
@@ -12,6 +12,7 @@ type DuploApiGatewayEvent struct {
 	ApiKeyRequired    bool                             `json:"ApiKeyRequired,omitempty"`
 	AuthorizerId      string                           `json:"AuthorizerId,omitempty"`
 	AuthorizationType string                           `json:"AuthorizationType,omitempty"`
+	ContentHandling   string                           `json:"ContentHandling,omitempty"`
 	Integration       *DuploApiGatewayEventIntegration `json:"Integration"`
 }
 

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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # 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.36" # RELEASE VERSION
+      version = "0.10.37" # RELEASE VERSION
       source  = "registry.terraform.io/duplocloud/duplocloud"
     }
   }

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