Merge pull request #990 from duplocloud/hotfix/0.11.7

Hotfix Release v0.11.7

Author: tahir-duplo

Makefile

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

docs/data-sources/aws_launch_template.md

@@ -20,12 +20,15 @@ description: |-
 - `name` (String)
 - `tenant_id` (String)
 
+### Optional
+
+- `version` (String) Any of the existing version of the launch template
+
 ### Read-Only
 
 - `ami` (String)
 - `default_version` (String)
 - `id` (String) The ID of this resource.
 - `instance_type` (String)
 - `latest_version` (String)
-- `version` (String) Any of the existing version of the launch template
 - `version_description` (String)

docs/data-sources/system_features.md

@@ -0,0 +1,67 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "duplocloud_system_features Data Source - terraform-provider-duplocloud"
+subcategory: ""
+description: |-
+  
+---
+
+# duplocloud_system_features (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Read-Only
+
+- `app_configs` (List of Object) (see [below for nested schema](#nestedatt--app_configs))
+- `aws_regions` (List of String)
+- `default_aws_account` (String)
+- `default_aws_partition` (String)
+- `default_aws_region` (String)
+- `default_infra_cloud` (String)
+- `devops_manager_hostname` (String)
+- `disable_oob_data` (Boolean)
+- `duplo_shell_fqdn` (String)
+- `eks_versions` (List of Object) (see [below for nested schema](#nestedatt--eks_versions))
+- `enabled_flags` (List of String)
+- `gcp_disable_duplo_prefix` (Boolean)
+- `gcp_disable_tenant_prefix` (Boolean)
+- `id` (String) The ID of this resource.
+- `is_aws_admin_jit_enabled` (Boolean)
+- `is_aws_cloud_enabled` (Boolean)
+- `is_azure_cloud_enabled` (Boolean)
+- `is_billing_enabled` (Boolean)
+- `is_compliance_enabled` (Boolean)
+- `is_duplo_ops_enabled` (Boolean)
+- `is_google_cloud_enabled` (Boolean)
+- `is_katkit_enabled` (Boolean)
+- `is_on_prem_enabled` (Boolean)
+- `is_otp_needed` (Boolean)
+- `is_siem_enabled` (Boolean)
+- `is_signup_enabled` (Boolean)
+- `is_tags_based_resource_mgmt_enabled` (Boolean)
+- `s3_bucket_name_prefix` (String)
+- `tags_based_managed_resources` (List of String)
+- `tenant_name_max_length` (Number)
+
+<a id="nestedatt--app_configs"></a>
+### Nested Schema for `app_configs`
+
+Read-Only:
+
+- `key` (String)
+- `type` (String)
+- `value` (String)
+
+
+<a id="nestedatt--eks_versions"></a>
+### Nested Schema for `eks_versions`
+
+Read-Only:
+
+- `default_version` (String)
+- `supported_versions` (List of String)

docs/resources/asg_instance_refresh.md

@@ -0,0 +1,59 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "duplocloud_asg_instance_refresh Resource - terraform-provider-duplocloud"
+subcategory: ""
+description: |-
+  duplocloud_asg_instance_refresh triggers the instance refresh of asg in duplo
+---
+
+# duplocloud_asg_instance_refresh (Resource)
+
+duplocloud_asg_instance_refresh triggers the instance refresh of asg in duplo
+
+## Example Usage
+
+```terraform
+resource "duplocloud_tenant" "myapp" {
+  account_name = "myapp"
+  plan_id      = "default"
+}
+
+
+resource "duplocloud_asg_instance_refresh" "name" {
+  tenant_id              = duplocloud_tenant.myapp.tenant_id
+  asg_name               = "asg-name"
+  refresh_identifier     = "1" #any identifier values can be used
+  max_healthy_percentage = 100
+  min_healthy_percentage = 90
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `asg_name` (String) The fullname of the asg
+- `tenant_id` (String) The GUID of the tenant that the asg will be created in.
+
+### Optional
+
+- `auto_rollback` (Boolean) Automatically rollback if instance refresh fails
+- `instance_warmup` (Number) Number of seconds until a newly launched instance is configured and ready to use. Default behavior is to use the Auto Scaling Group's health check grace period.
+- `max_healthy_percentage` (Number) Amount of capacity in the Auto Scaling group that can be in service and healthy, or pending, to support your workload when an instance refresh is in place, as a percentage of the desired capacity of the Auto Scaling group. Defaults to `100`.
+- `min_healthy_percentage` (Number) Amount of capacity in the Auto Scaling group that must remain healthy during an instance refresh to allow the operation to continue, as a percentage of the desired capacity of the Auto Scaling group. Defaults to `90`.
+- `refresh_identifier` (String) To identify refresh or invoke a refresh
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `create` (String)
+- `delete` (String)
+- `update` (String)

docs/resources/aws_launch_template.md

@@ -36,12 +36,12 @@ resource "duplocloud_aws_launch_template" "lt" {
 - `instance_type` (String) Asg instance type to be used to update the version from the current version
 - `name` (String) The fullname of the asg group
 - `tenant_id` (String) The GUID of the tenant that the launch template will be created in.
-- `version` (String) Any of the existing version of the launch template
 
 ### Optional
 
 - `ami` (String) Asg ami to be used to update the version from the current version
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+- `version` (String) Any of the existing version of the launch template
 - `version_description` (String) The version of the launch template
 
 ### Read-Only
@@ -68,7 +68,7 @@ Import is supported using the following syntax:
 # Example: Importing an existing AWS launch template
 #  - *TENANT_ID* is the tenant GUID
 #  - *NAME* is the name of the AWS launch template
-#  - *VERSION* available version of launch template
+#  - *VERSION* available version of launch template , it is optional, use if needed to import specific version of available launch template
 
 terraform import duplocloud_aws_launch_template.lt *TENANT_ID*/launch-template/*NAME*/*VERSION*
 ```

docs/resources/duplo_service_lbconfigs.md

@@ -45,8 +45,8 @@ resource "duplocloud_duplo_service_lbconfigs" "myservice" {
     health_check {
       healthy_threshold   = 4
       unhealthy_threshold = 4
-      timeout             = 50
-      interval            = 30
+      timeout             = 30
+      interval            = 50
       http_success_codes  = "200-399"
     }
   }
@@ -69,8 +69,8 @@ resource "duplocloud_duplo_service_lbconfigs" "myservice2" {
     health_check {
       healthy_threshold   = 4
       unhealthy_threshold = 4
-      timeout             = 50
-      interval            = 30
+      timeout             = 30
+      interval            = 50
       http_success_codes  = "200-399"
     }
   }

docs/resources/gcp_node_pool.md

@@ -3,12 +3,12 @@
 page_title: "duplocloud_gcp_node_pool Resource - terraform-provider-duplocloud"
 subcategory: ""
 description: |-
-  duplocloud_gcp_k8_node_pools manages a GCP Node Pool in Duplo.
+  duplocloud_gcp_node_pool manages a GCP Node Pool in Duplo.
 ---
 
 # duplocloud_gcp_node_pool (Resource)
 
-`duplocloud_gcp_k8_node_pools` manages a GCP Node Pool in Duplo.
+`duplocloud_gcp_node_pool` manages a GCP Node Pool in Duplo.
 
 ## Example Usage
 
@@ -18,10 +18,10 @@ resource "duplocloud_tenant" "myapp" {
   plan_id      = "default"
 }
 
-
+#Example for upgrade strategy NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED
 resource "duplocloud_gcp_node_pool" "myNodePool" {
   tenant_id              = duplocloud_tenant.myapp.tenant_id
-  name                   = "myNodePool"
+  name                   = "mynodepool"
   is_autoscaling_enabled = false
   accelerator {
     accelerator_count  = "2"
@@ -35,11 +35,6 @@ resource "duplocloud_gcp_node_pool" "myNodePool" {
       gpu_driver_version = "DEFAULT"
     }
   }
-  upgrade_settings {
-    strategy        = "NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED"
-    max_surge       = 4
-    max_unavailable = 2
-  }
   zones           = ["us-east1-c"]
   location_policy = "BALANCED"
   auto_upgrade    = true

docs/resources/k8_helm_repository.md

@@ -26,6 +26,20 @@ resource "duplocloud_k8_helm_repository" "repo" {
   interval  = "06m00s"
   url       = "https://helm.github.com"
 }
+
+
+resource "duplocloud_k8_helm_repository" "repo" {
+  name             = "repo-name"
+  interval         = "06m00s"
+  url              = "oci://registry-1.docker.io/bitnamicharts"
+  tenant_id        = duplocloud_tenant.myapp.tenant_id
+  insecure         = true
+  pass_credentials = true
+  helm_provider    = "generic"
+  suspend          = true
+  type             = "oci"
+
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -39,8 +53,13 @@ resource "duplocloud_k8_helm_repository" "repo" {
 
 ### Optional
 
+- `helm_provider` (String) The provider attribute in the spec block of a HelmRepository specifies the cloud  example: generic, aws, gcp, azure
+- `insecure` (Boolean) Set to skip TLS certificate verification when accessing the repository.
 - `interval` (String) The interval associated to helm repository Defaults to `5m0s`.
+- `pass_credentials` (Boolean) Pass credentials even to a different host than the one used in url
+- `suspend` (Boolean) Used to pause the reconciliation of the repository by the controller.
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+- `type` (String) The Helm repository type. Possible values are default for a Helm HTTP/S repository, or oci for an OCI Helm repository.
 
 ### Read-Only
 

duplocloud/data_source_duplo_aws_launch_template.go

@@ -1,9 +1,11 @@
 package duplocloud
 
 import (
+	"strings"
+
 	"github.com/duplocloud/terraform-provider-duplocloud/duplosdk"
-	"strconv"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
@@ -25,6 +27,7 @@ func dataSourceAwsLaunchTemplate() *schema.Resource {
 			"version": {
 				Description: "Any of the existing version of the launch template",
 				Type:        schema.TypeString,
+				Optional:    true,
 				Computed:    true,
 			},
 			"default_version": {
@@ -54,9 +57,18 @@ func dataSourceAwsLaunchTemplate() *schema.Resource {
 
 func datasourceAwsLaunchTemplateRead(d *schema.ResourceData, m interface{}) error {
 	tenantId := d.Get("tenant_id").(string)
-	asgName := d.Get("name").(string)
-	ver := "1"
+	name := d.Get("name").(string)
+	ver := d.Get("version").(string)
+	asgName := name
+	var err duplosdk.ClientError
 	c := m.(*duplosdk.Client)
+	if !strings.Contains(name, "duploservices") {
+		asgName, err = c.GetResourceName("duploservices", tenantId, name, false)
+		if err != nil {
+			diag.FromErr(err)
+		}
+	}
+
 	rp, err := c.GetAwsLaunchTemplate(tenantId, asgName)
 	if err != nil {
 		if err.Status() == 404 {
@@ -69,40 +81,11 @@ func datasourceAwsLaunchTemplateRead(d *schema.ResourceData, m interface{}) erro
 		d.SetId("")
 		return nil
 	}
-	d.SetId(tenantId + "/launch-template/" + asgName + "/" + ver)
+	d.SetId(tenantId + "/launch-template/" + asgName)
 
-	fErr := flattenLaunchTemplateData(d, rp, ver)
+	fErr := flattenLaunchTemplate(d, rp, ver)
 	if fErr != nil {
 		return err
 	}
 	return nil
 }
-
-func flattenLaunchTemplateData(d *schema.ResourceData, rp *[]duplosdk.DuploLaunchTemplateResponse, ver string) error {
-
-	var name, cver, insType, verDesc, dver, imgId string
-	max := 0
-	for _, v := range *rp {
-		if strconv.Itoa(int(v.VersionNumber)) == ver {
-			name = v.LaunchTemplateName
-			cver = strconv.Itoa(int(v.VersionNumber))
-		}
-		if v.DefaultVersion {
-			dver = strconv.Itoa(int(v.VersionNumber))
-		}
-		if max < int(v.VersionNumber) {
-			max = int(v.VersionNumber)
-			insType = v.LaunchTemplateData.InstanceType.Value
-			verDesc = v.VersionDescription
-			imgId = v.LaunchTemplateData.ImageId
-		}
-	}
-	d.Set("instance_type", insType)
-	d.Set("version_description", verDesc)
-	d.Set("name", name)
-	d.Set("version", cver)
-	d.Set("latest_version", strconv.Itoa(max))
-	d.Set("default_version", dver)
-	d.Set("ami", imgId)
-	return nil
-}