Merge pull request #1255 from duplocloud/hotfix/0.11.29

Hotfix Release v0.11.29

Author: Duplo-nikv

Makefile

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

docs/data-sources/duplo_service_lbconfigs.md

@@ -53,6 +53,7 @@ Read-Only:
 - `cloud_name` (String)
 - `custom_cidr` (List of String)
 - `dns_name` (String)
+- `eip_allocations` (List of String)
 - `external_port` (Number)
 - `external_traffic_policy` (String)
 - `extra_selector_label` (List of Object) (see [below for nested schema](#nestedobjatt--services--lbconfigs--extra_selector_label))

docs/resources/azure_vm_maintenance_configuration.md

@@ -25,7 +25,7 @@ resource "duplocloud_azure_vm_maintenance_configuration" "mt" {
   window {
     start_time      = "2024-11-12 00:00"
     expiration_time = "2024-11-19 00:00"
-    duration        = "06:00"
+    duration        = "02:00"
     recur_every     = "1Month day1,day2,day3,day4,day5,day6,day7,day8,day9,day10,day11,day12,day13,day14,day15,day16,day17,day18,day19,day20,day21,day22,day23,day24,day25,day26,day27,day28,day29,day30,day31,day-1"
     time_zone       = "India Standard Time"
   }
@@ -70,7 +70,7 @@ Required:
 
 Optional:
 
-- `duration` (String) The duration of the maintenance window in HH:mm format.
+- `duration` (String) The duration of the maintenance window in HH:mm format. Should be less than or equal to 3 Hrs
 - `expiration_time` (String) Effective expiration date of the maintenance window in YYYY-MM-DD hh:mm format.
 - `recur_every` (String) he rate at which a maintenance window is expected to recur. The rate can be expressed as daily, weekly, or monthly schedules.
 

docs/resources/duplo_service_lbconfigs.md

@@ -75,6 +75,23 @@ resource "duplocloud_duplo_service_lbconfigs" "myservice2" {
     }
   }
 }
+
+//Example to attach elastic ips to public NLB
+resource "duplocloud_duplo_service_lbconfigs" "myservice" {
+  tenant_id                   = "b4315a73-6455-4e99-8e26-7a771018cc1e"
+  replication_controller_name = "nlb-docker"
+
+  lbconfigs {
+    external_port   = 443
+    is_native       = false
+    lb_type         = 6
+    port            = "3027"
+    protocol        = "tcp"
+    is_internal     = false
+    eip_allocations = ["eipalloc-0448f756b404093cb", "eipalloc-0b700a23ac3f2522d"]
+  }
+
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -131,6 +148,9 @@ Optional:
 - `backend_protocol_version` (String) Is used for communication between the load balancer and the target instances. This field is used to set protocol version for ALB load balancer. Only applicable when protocol is HTTP or HTTPS. The protocol version. Specify GRPC to send requests to targets using gRPC. Specify HTTP2 to send requests to targets using HTTP/2. The default is HTTP1, which sends requests to targets using HTTP/1.1
 - `certificate_arn` (String) The ARN of an ACM certificate to associate with this load balancer.  Only applicable for HTTPS.
 - `custom_cidr` (List of String) Specify CIDR Values. This is applicable only for Network Load Balancer if `lb_type` is `6`.
+- `eip_allocations` (List of String) Allocate Elastic IP to load balancer, which is configured under plan configuration.
+
+Note: This field can only be set for non internal lbtype NLB(6)
 - `external_port` (Number) The frontend port associated with this load balancer configuration. Required if `lb_type` is not `7`.
 - `external_traffic_policy` (String) Only for K8S Node Port (`lb_type = 4`) or load balancers in Kubernetes.  Set the kubernetes service `externalTrafficPolicy` attribute.
 - `extra_selector_label` (Block List) Only for K8S services or load balancers in Kubernetes.  Sets an additional selector label to narrow which pods can receive traffic. (see [below for nested schema](#nestedblock--lbconfigs--extra_selector_label))

docs/resources/tenant_network_security_rule.md

@@ -76,13 +76,16 @@ Import is supported using the following syntax:
 ```shell
 # Example 1: Importing a "source_tenant" rule:
 #  - TENANT_ID is the target tenant GUID
-#  - TYPE SG rule type integer value Tenant SG = 0 IP Address SG = 1 
-#  - SOURCE_TENANT for type 0, this is the source tenant name
-#  - SOURCE_ADDRESS for TYPE = 1, this is the source IP address or CIDR block, format 10.220.32.192-32.  
+#  - TYPE (0/1) : If the source in the Duplo portal is a tenant name, represent the TYPE as 0. If the source is an IP address, represent the TYPE as 1.
+#  - SOURCE_TENANT : Name of security group's source tenant
+#  - SOURCE_ADDRESS IP address or CIDR block, format 10.220.32.192-32.  
 #  - PROTOCOL is the protocol (tcp, udp, icmp)
 #  - FROM_PORT is the starting port (0-65535)
 #  - TO_PORT is the ending port (0-65535)
 terraform import duplocloud_tenant_network_security_rule.myrule *TENANT_ID*/*TYPE*/*SOURCE_TENANT*/*PROTOCOL*/*FROM_PORT*/*TO_PORT*
+#Example : terraform import duplocloud_tenant_network_security_rule.myrule {GUID}/0/abc/tcp/443/443
+
 
 terraform import duplocloud_tenant_network_security_rule.myrule *TENANT_ID*/*TYPE*/*SOURCE_ADDRESS*/*PROTOCOL*/*FROM_PORT*/*TO_PORT*
+#Example : terraform import duplocloud_tenant_network_security_rule.myrule {GUID}/1/10.34.0.1-32/tcp/443/443
 ```

duplocloud/data_source_duplo_ecs_task_definition.go

@@ -3,9 +3,10 @@ package duplocloud
 import (
 	"context"
 	"fmt"
-	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
 	"log"
 
+	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -50,9 +51,18 @@ func dataSourceDuploEcsTaskDefinitionRead(ctx context.Context, d *schema.Resourc
 		return diag.Errorf("Unable to read tenant %s ECS task definition '%s': not found", tenantID, arn)
 	}
 	d.SetId(fmt.Sprintf("%s/%s", tenantID, arn))
+	tenant, cerr := c.TenantGetV2(tenantID)
+	if cerr != nil {
+		if cerr.Status() == 404 {
+			log.Printf("Tenant %s not found", tenantID)
+			d.SetId("")
+			return nil
+		}
+		return diag.Errorf("Duplocloud resource tenant information'\n%s", err)
+	}
 
 	// Read the object into state
-	flattenEcsTaskDefinition(duplo, d)
+	flattenEcsTaskDefinition(duplo, d, tenant.AccountName)
 
 	log.Printf("[TRACE] dataSourceDuploEcsTaskDefinitionRead(%s, %s): end", tenantID, arn)
 	return nil

duplocloud/resource_duplo_aws_cloudfront_distribution.go

@@ -1146,9 +1146,22 @@ func expandAwsCloudfrontDistributionDefaultCacheBehavior(m map[string]interface{
 	}
 
 	if m["cache_policy_id"].(string) == "" {
-		dcb.MinTTL = m["min_ttl"].(int)
-		dcb.MaxTTL = m["max_ttl"].(int)
-		dcb.DefaultTTL = m["default_ttl"].(int)
+		min := m["min_ttl"]
+		if min != nil {
+			v := min.(int)
+			dcb.MinTTL = &v
+		}
+		max := m["max_ttl"]
+		if max != nil {
+			v := max.(int)
+			dcb.MaxTTL = &v
+		}
+		def := m["default_ttl"]
+		if def != nil {
+			v := def.(int)
+			dcb.DefaultTTL = &v
+		}
+
 	}
 
 	// TODO Handle "trusted_key_groups"

duplocloud/resource_duplo_aws_dynamodb_table_v2.go

@@ -1166,8 +1166,10 @@ func shouldUpdateThroughput(
 	request *duplosdk.DuploDynamoDBTableRequestV2,
 
 ) bool {
-	if (table.ProvisionedThroughput.ReadCapacityUnits != request.ProvisionedThroughput.ReadCapacityUnits) || (table.ProvisionedThroughput.WriteCapacityUnits != request.ProvisionedThroughput.WriteCapacityUnits) {
-		return true
+	if table.ProvisionedThroughput != nil && request.ProvisionedThroughput != nil {
+		if (table.ProvisionedThroughput.ReadCapacityUnits != request.ProvisionedThroughput.ReadCapacityUnits) || (table.ProvisionedThroughput.WriteCapacityUnits != request.ProvisionedThroughput.WriteCapacityUnits) {
+			return true
+		}
 	}
 	return false
 }

duplocloud/resource_duplo_azure_datafactory.go

@@ -2,11 +2,12 @@ package duplocloud
 
 import (
 	"context"
-	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
 	"log"
 	"strings"
 	"time"
 
+	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -84,6 +85,7 @@ func resourceAzureDataFactoryRead(ctx context.Context, d *schema.ResourceData, m
 		if err.Status() == 404 {
 			log.Printf("[DEBUG] resourceAzureDataFactoryRead: Datafactory %s not found for tenantId %s, removing from state", name, tenantId)
 			d.SetId("")
+			return nil
 		}
 		return diag.Errorf("Unable to retrieve datafactory details error: %s", err.Error())
 	}

duplocloud/resource_duplo_azure_log_analytics_workspace.go

@@ -3,11 +3,12 @@ package duplocloud
 import (
 	"context"
 	"fmt"
-	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
 	"log"
 	"strings"
 	"time"
 
+	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -109,9 +110,14 @@ func resourceAzureLogAnalyticsWorkspaceRead(ctx context.Context, d *schema.Resou
 		}
 		return diag.Errorf("Unable to retrieve tenant %s azure Log Analytics Workspace %s : %s", infraName, name, clientErr)
 	}
+	if duplo.ID == "" {
+		log.Printf("[DEBUG] resourceAzureLogAnalyticsWorkspaceRead: Azure Log Analytics Workspace %s not found for tenantId %s, removing from state", name, infraName)
+		d.SetId("")
 
+	}
+	rgpn := strings.Split(duplo.ID, "/")
 	d.Set("infra_name", infraName)
-	d.Set("resource_group_name", strings.Split(duplo.ID, "/")[4])
+	d.Set("resource_group_name", rgpn[len(rgpn)-1])
 	d.Set("name", name)
 	d.Set("azure_id", duplo.ID)
 	d.Set("sku", duplo.PropertiesSku.Name)
@@ -166,6 +172,25 @@ func resourceAzureLogAnalyticsWorkspaceUpdate(ctx context.Context, d *schema.Res
 }
 
 func resourceAzureLogAnalyticsWorkspaceDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	id := d.Id()
+	infraName, name, err := parseAzureLogAnalyticsWorkspaceIdParts(id)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	log.Printf("[TRACE] resourceAzureLogAnalyticsWorkspaceRead(%s, %s): start", infraName, name)
+
+	c := m.(*duplosdk.Client)
+	cerr := c.AzureLogAnalyticsWorkspaceCreate(infraName, duplosdk.DuploAzureLogAnalyticsWorkspaceRq{
+		Name:          "",
+		ResourceGroup: "",
+	})
+	if cerr != nil {
+		if cerr.Status() == 404 {
+			return nil
+		}
+		return diag.Errorf("Error creating tenant %s azure Log Analytics Workspace '%s': %s", infraName, name, err)
+	}
+
 	return nil // Backend doesn't support delete.
 }