Merge pull request #1133 from duplocloud/hotfix/0.11.17

Hotfix Release v0.11.17

Author: Duplo-nikv

Makefile

@@ -8,7 +8,7 @@ NAMESPACE=duplocloud
 
 NAME=duplocloud
 BINARY=terraform-provider-${NAME}
-VERSION=0.11.16
+VERSION=0.11.17
 #mac
 #OS_ARCH=darwin_amd64
 #OS_ARCH=linux_amd64

docs/resources/k8_ingress.md

@@ -100,10 +100,10 @@ resource "duplocloud_k8_ingress" "ingress" {
   name               = "external-echo"
   ingress_class_name = "alb"
   lbconfig {
-    is_internal     = false
-    dns_prefix      = "external-echo"
-    certificate_arn = "put your certificate ARN here"
-    https_port      = 443
+    is_internal      = false
+    dns_prefix       = "external-echo"
+    certificate_arns = ["<cert-arn1>", "<cert-arn2>"]
+    https_port       = 443
   }
 
   rule {
@@ -245,7 +245,8 @@ Required:
 
 Optional:
 
-- `certificate_arn` (String) The ARN of an ACM certificate to associate with this load balancer.  Only applicable for HTTPS.
+- `certificate_arn` (String, Deprecated) The ARN of an ACM certificate to associate with this load balancer.  Only applicable for HTTPS. This field has been deprecated use certificate_arns
+- `certificate_arns` (List of String) The list of ARN of an ACM certificate to associate with this load balancer.  Only applicable for HTTPS.
 - `http_port` (Number) HTTP Listener Port.
 - `https_port` (Number) HTTPS Listener Port.
 - `port_override` (String) Port override for the load balancer. Currently supported for Azure

duplocloud/provider_test.go

@@ -2,11 +2,12 @@ package duplocloud
 
 import (
 	"context"
-	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
-	"github.com/duplocloud/terraform-provider-duplocloud/internal/duplosdktest"
 	"log"
 	"strings"
 
+	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
+	"github.com/duplocloud/terraform-provider-duplocloud/internal/duplosdktest"
+
 	"github.com/barkimedes/go-deepcopy"
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -85,7 +86,7 @@ func testAccProvider_ConfigureContextFunc(d *schema.Provider) schema.ConfigureCo
 					return
 				},
 			},
-			"/adminproxy/GetInfrastructureConfig/:infraName": {
+			"/v3/admin/infrastructure/:infraName": {
 				Factory: func() interface{} { return &duplosdk.DuploInfrastructureConfig{} },
 				Responder: func(verb string, in interface{}) (id string, out interface{}) {
 					out = deepcopy.MustAnything(in.(*duplosdk.DuploInfrastructureConfig))

duplocloud/resource_duplo_ecache_instance.go

@@ -316,11 +316,7 @@ func resourceDuploEcacheInstanceCreate(ctx context.Context, d *schema.ResourceDa
 	}
 	c := m.(*duplosdk.Client)
 
-	fullName, errname := c.GetResourceName("duplo", tenantID, duplo.Name, false)
-	if errname != nil {
-		return diag.Errorf("resourceDuploEcacheInstanceCreate: Unable to retrieve duplo service name (name: %s, error: %s)", duplo.Name, errname.Error())
-
-	}
+	fullName := "duplo-" + duplo.Name
 	if !validateStringLength(fullName, TOTALECACHENAMELENGTH) {
 		return diag.Errorf("resourceDuploEcacheInstanceCreate: fullname %s exceeds allowable ecache name length %d)", fullName, TOTALECACHENAMELENGTH)
 

duplocloud/resource_duplo_gcp_k8_node_pool.go

@@ -725,13 +725,15 @@ func resourceGCPNodePoolRead(ctx context.Context, d *schema.ResourceData, m inte
 	duplo, err := c.GCPK8NodePoolGet(tenantID, fullName)
 	if err != nil {
 		if err.Status() == 404 {
+			log.Printf("GCP node pool %s not found", fullName)
 			d.SetId("") // object missing or deleted
 			return nil
 		}
 		return diag.Errorf("Unable to retrieve tenant %s GCP Node Pool Domain '%s': %s", tenantID, fullName, err)
 	}
 
 	if duplo == nil {
+		log.Printf("GCP node pool %s not found", fullName)
 		d.SetId("") // object missing or deleted
 		return nil
 	}
@@ -917,9 +919,13 @@ func resourceGcpNodePoolDelete(ctx context.Context, d *schema.ResourceData, m in
 	}
 
 	err = c.GCPK8NodePoolDelete(tenantID, fullName)
-	if err != nil {
+	if err != nil && err.Status() != 404 {
 		return diag.Errorf("Error deleting node pool '%s': %s", id, err)
 	}
+	if err != nil && err.Status() == 404 {
+		log.Printf("GCP node pool %s not found", fullName)
+		return nil
+	}
 	derr := gcpNodePoolWaitUntilAvailableForDeleted(ctx, c, tenantID, fullName, d.Timeout("delete"))
 	if derr != nil {
 		return diag.Errorf("%s", derr)

duplocloud/resource_duplo_infrastructure.go

@@ -339,11 +339,12 @@ func resourceInfrastructureRead(ctx context.Context, d *schema.ResourceData, m i
 	// Get the object from Duplo, detecting a missing object
 	c := m.(*duplosdk.Client)
 	missing, err := infrastructureRead(c, d, name)
-	if err != nil {
+	if err != nil && err.Status() != 404 {
 		return diag.Errorf("Unable to retrieve infrastructure '%s': %s", name, err)
 	}
-	if missing {
+	if (err != nil && err.Status() == 404) || missing {
 		d.SetId("") // object missing
+		log.Printf("Infrastructure not found")
 		return nil
 	}
 
@@ -580,7 +581,7 @@ func duploInfrastructureWaitUntilReady(ctx context.Context, c *duplosdk.Client,
 	return err
 }
 
-func infrastructureRead(c *duplosdk.Client, d *schema.ResourceData, name string) (bool, error) {
+func infrastructureRead(c *duplosdk.Client, d *schema.ResourceData, name string) (bool, duplosdk.ClientError) {
 	var infra *duplosdk.DuploInfrastructureConfig
 	config, err := c.InfrastructureGetConfig(name)
 	if err != nil {
@@ -735,7 +736,7 @@ func infrastructureRead(c *duplosdk.Client, d *schema.ResourceData, name string)
 	if config.Cloud == 3 {
 		natIPs, err := c.GetGCPInfraNATIPs(name)
 		if err != nil {
-			return false, fmt.Errorf("error retrieving GCP NAT IPs for infrastructure '%s': %s", name, err)
+			return false, err
 		}
 		if natIPs != nil {
 			natIPsList := make([]interface{}, len(natIPs))

duplocloud/resource_duplo_k8_ingress.go

@@ -56,9 +56,23 @@ func k8sIngressSchema() map[string]*schema.Schema {
 					"certificate_arn": {
 						Description: "The ARN of an ACM certificate to associate with this load balancer.  Only applicable for HTTPS.",
 						Type:        schema.TypeString,
-						Computed:    true,
-						Optional:    true,
+						//Computed:      true,
+						Optional:      true,
+						Deprecated:    "This field has been deprecated use certificate_arns",
+						ConflictsWith: []string{"lbconfig.0.certificate_arns"},
+					},
+					"certificate_arns": {
+						Description: "The list of ARN of an ACM certificate to associate with this load balancer.  Only applicable for HTTPS.",
+						Type:        schema.TypeList,
+						//Computed:      true,
+						Optional:      true,
+						ConflictsWith: []string{"lbconfig.0.certificate_arn"},
+
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
 					},
+
 					"http_port": {
 						Description: "HTTP Listener Port.",
 						Type:        schema.TypeInt,
@@ -318,7 +332,18 @@ func flattenK8sIngress(tenantId string, d *schema.ResourceData, duplo *duplosdk.
 
 	// Set LBConfig
 	if duplo.LbConfig != nil {
-		d.Set("lbconfig", []interface{}{flattenK8sIngressLBConfig(duplo.LbConfig)})
+		confHandler := map[string]bool{
+			"arn":  false,
+			"arns": false,
+		}
+		arn := d.Get("lbconfig.0.certificate_arn").(string)
+		arns := d.Get("lbconfig.0.certificate_arns").([]interface{})
+		if arn != "" {
+			confHandler["arn"] = true
+		} else if len(arns) > 0 {
+			confHandler["arns"] = true
+		}
+		d.Set("lbconfig", []interface{}{flattenK8sIngressLBConfig(duplo.LbConfig, confHandler)})
 	}
 
 	// Set Rules
@@ -334,12 +359,27 @@ func flattenK8sIngress(tenantId string, d *schema.ResourceData, duplo *duplosdk.
 	}
 }
 
-func flattenK8sIngressLBConfig(duplo *duplosdk.DuploK8sLbConfig) map[string]interface{} {
+func flattenK8sIngressLBConfig(duplo *duplosdk.DuploK8sLbConfig, confHandler map[string]bool) map[string]interface{} {
 	m := map[string]interface{}{
-		"is_internal":     !duplo.IsPublic,
-		"dns_prefix":      duplo.DnsPrefix,
-		"certificate_arn": duplo.CertArn,
+		"is_internal": !duplo.IsPublic,
+		"dns_prefix":  duplo.DnsPrefix,
+	}
+	if confHandler["arn"] {
+		m["certificate_arn"] = duplo.CertArn
+	}
+
+	if confHandler["arns"] {
+		certArns := strings.Split(duplo.CertArn, ",")
+		if len(certArns) > 0 {
+			arns := make([]interface{}, 0, len(certArns))
+			for _, certArn := range certArns {
+				arns = append(arns, certArn)
+			}
+
+			m["certificate_arns"] = arns
+		}
 	}
+
 	if duplo.Listeners != nil && len(duplo.Listeners.Http) > 0 {
 		m["http_port"] = duplo.Listeners.Http[0]
 	}
@@ -436,6 +476,13 @@ func expandK8sIngressLBConfig(m map[string]interface{}) *duplosdk.DuploK8sLbConf
 	if v, ok := m["port_override"]; ok && v.(string) != "" {
 		dcb.FrontendPortOverride = v.(string)
 	}
+	if v, ok := m["certificate_arns"]; ok && len(v.([]interface{})) > 0 {
+		xs := []string{}
+		for _, s := range v.([]interface{}) {
+			xs = append(xs, s.(string))
+		}
+		dcb.CertArn = strings.Join(xs, ",")
+	}
 	return dcb
 }
 

duplocloud/resource_duplo_k8_secret.go

@@ -104,12 +104,10 @@ func resourceK8SecretRead(ctx context.Context, d *schema.ResourceData, m interfa
 
 	// Get the object from Duplo, detecting a missing object
 	c := m.(*duplosdk.Client)
-	rp, err := c.K8SecretGet(tenantId, name)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	if rp == nil || rp.SecretName == "" {
+	rp, cerr := c.K8SecretGet(tenantId, name)
+	if cerr != nil {
 		d.SetId("")
+		log.Printf("%s", cerr.Error())
 		return nil
 	}
 

duplocloud/resource_duplo_plan_settings.go

@@ -2,10 +2,11 @@ package duplocloud
 
 import (
 	"context"
-	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
 	"log"
 	"time"
 
+	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -103,23 +104,39 @@ func resourcePlanSettingsRead(ctx context.Context, d *schema.ResourceData, m int
 
 	// Get "special" plan settings.
 	settings, err := c.PlanGetSettings(planID)
-	if err != nil {
+	if err != nil && err.Status() != 404 {
 		return diag.Errorf("failed to retrieve plan settings for '%s': %s", planID, err)
 	}
-
+	if (err != nil && err.Status() == 404) || settings == nil {
+		d.SetId("")
+		log.Printf("plan settings not found for plan %s", planID)
+		return nil
+	}
 	// Get plan DNS config.  If the config is "global", that means there is no plan DNS config.
 	dns, err := c.PlanGetDnsConfig(planID)
-	if err != nil {
+	if err != nil && err.Status() != 404 {
 		return diag.Errorf("failed to retrieve plan DNS config for '%s': %s", planID, err)
 	}
+
+	if (err != nil && err.Status() == 404) || settings == nil {
+		d.SetId("")
+		log.Printf("plan settings DNS config not found for plan %s", planID)
+		return nil
+	}
+
 	if dns != nil && dns.IsGlobalDNS {
 		dns = nil
 	}
 
 	// Get plan metadata.
 	allMetadata, err := c.PlanMetadataGetList(planID)
-	if err != nil {
-		return diag.Errorf("failed to retrieve plan metadata for '%s': %s", planID, err)
+	if err != nil && err.Status() != 404 {
+		return diag.Errorf("failed to retrieve plan settings for '%s': %s", planID, err)
+	}
+	if (err != nil && err.Status() == 404) || settings == nil {
+		d.SetId("")
+		log.Printf("plan settings not found for plan %s", planID)
+		return nil
 	}
 
 	// Set the simple fields first.
@@ -198,33 +215,49 @@ func resourcePlanSettingsDelete(ctx context.Context, d *schema.ResourceData, m i
 	}
 
 	// Skip if plan does not exist.
-	if settings == nil {
+	if (err != nil && err.Status() == 404) || settings == nil {
+		log.Printf("plan settings not found for plan %s", planID)
 		return nil
 	}
 
 	// Undo the plan settings we can control here.
 	if _, ok := d.GetOk("unrestricted_ext_lb"); ok {
 		settings.UnrestrictedExtLB = false
 		_, err := c.PlanUpdateSettings(planID, settings)
-		if err != nil {
-			return diag.Errorf("failed to remove plan settings for '%s': %s", planID, err)
+		if err != nil && err.Status() != 404 {
+			return diag.Errorf("failed to update plan settings for '%s': %s", planID, err)
+		}
+		if (err != nil && err.Status() == 404) || settings == nil {
+			log.Printf("plan settings not found for plan %s", planID)
+			return nil
 		}
+
 	}
 
 	// Undo the plan DNS.
 	if _, ok := d.GetOk("dns_setting"); ok {
 		err := c.PlanDeleteDnsConfig(planID)
-		if err != nil {
+		if err != nil && err.Status() != 404 {
 			return diag.Errorf("failed to remove plan DNS config for '%s': %s", planID, err)
 		}
+		if (err != nil && err.Status() == 404) || settings == nil {
+			log.Printf("plan settings dns config not found for plan %s", planID)
+			return nil
+		}
+
 	}
 
 	// Undo the plan metadata
 	if _, ok := d.GetOk("metadata"); ok {
 		allMetadata, err := c.PlanMetadataGetList(planID)
-		if err != nil {
+
+		if err != nil && err.Status() != 404 {
 			return diag.Errorf("failed to retrieve plan metadata for '%s': %s", planID, err)
 		}
+		if (err != nil && err.Status() == 404) || settings == nil {
+			log.Printf("plan settings metadata not found for plan %s", planID)
+			return nil
+		}
 
 		// Get the previous and desired plan configs
 		previous, _ := getPlanMetadataChange(allMetadata, d)
@@ -235,6 +268,13 @@ func resourcePlanSettingsDelete(ctx context.Context, d *schema.ResourceData, m i
 		if err != nil {
 			return diag.Errorf("failed to remove plan metadata for '%s': %s", planID, err)
 		}
+		if err != nil && err.Status() != 404 {
+			return diag.Errorf("failed to remove plan metadata for '%s': %s", planID, err)
+		}
+		if (err != nil && err.Status() == 404) || settings == nil {
+			log.Printf("plan settings metadata not found for plan %s", planID)
+			return nil
+		}
 	}
 
 	log.Printf("[TRACE] resourcePlanSettingsDelete(%s): end", planID)

duplocloud/resource_duplo_tenant.go

@@ -132,6 +132,7 @@ func resourceTenantRead(ctx context.Context, d *schema.ResourceData, m interface
 	duplo, err := c.TenantGetV2(tenantID)
 	if err != nil {
 		if err.Status() == 404 {
+			log.Printf("Tenant %s not found", tenantID)
 			d.SetId("")
 			return nil
 		}
@@ -255,6 +256,7 @@ func resourceTenantDelete(ctx context.Context, d *schema.ResourceData, m interfa
 		duplo, err := c.TenantGetV2(tenantID)
 		if err != nil {
 			if err.Status() == 404 {
+				log.Printf("Tenant %s not found", tenantID)
 				return nil
 			}
 			return diag.Errorf("Unable to retrieve tenant '%s': %s", tenantID, err)
@@ -265,6 +267,7 @@ func resourceTenantDelete(ctx context.Context, d *schema.ResourceData, m interfa
 		err = c.TenantDelete(tenantID)
 		if err != nil {
 			if err.Status() == 404 {
+				log.Printf("Tenant %s not found", tenantID)
 				return nil
 			}
 			return diag.Errorf("Error deleting tenant '%s': %s", tenantID, err)