move to single deployment resource

Author: vandyliu

.github/workflows/testacc.yml

@@ -60,7 +60,10 @@ jobs:
           HYBRID_ORGANIZATION_ID: ckmzjm22937931d35puw3tcdo
           HOSTED_ORGANIZATION_API_TOKEN: ${{ secrets.DEV_HOSTED_ORGANIZATION_API_TOKEN }}
           HOSTED_ORGANIZATION_ID: clczfgzc3001o01kjlphpi6hv
+          HYBRID_CLUSTER_ID: clk8h0fv1006801j8yysfybbt
+          HYBRID_NODE_POOL_ID: clk8h0fv1006701j8ku45qtb9
           ASTRO_API_HOST: https://api.astronomer-dev.io
+          TESTARGS: "-failfast"
         run: make testacc
         timeout-minutes: 10
 

Makefile

@@ -12,7 +12,7 @@ OAPI_CODEGEN ?= $(ENVTEST_ASSETS_DIR)/oapi-codegen
 # Run acceptance tests
 .PHONY: testacc
 testacc:
-	TF_ACC=1 go test ./... -v -failfast -run TestAcc $(TESTARGS) -timeout 120m
+	TF_ACC=1 go test ./... -v -run TestAcc $(TESTARGS) -timeout 120m
 
 # Run unit tests
 .PHONY: test

docs/resources/standard_deployment.md docs/resources/deployment.md

@@ -1,14 +1,14 @@
 ---
 # generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "astronomer_standard_deployment Resource - astronomer"
+page_title: "astronomer_deployment Resource - astronomer"
 subcategory: ""
 description: |-
-  Standard Deployment resource
+  Deployment resource
 ---
 
-# astronomer_standard_deployment (Resource)
+# astronomer_deployment (Resource)
 
-Standard Deployment resource
+Deployment resource
 
 
 
@@ -17,27 +17,32 @@ Standard Deployment resource
 
 ### Required
 
-- `cloud_provider` (String) Deployment cloud provider - if changing this value, the deployment will be recreated in the new cloud provider
 - `contact_emails` (List of String) Deployment contact emails
-- `default_task_pod_cpu` (String) Deployment default task pod CPU
-- `default_task_pod_memory` (String) Deployment default task pod memory
 - `description` (String) Deployment description
 - `environment_variables` (Attributes List) Deployment environment variables (see [below for nested schema](#nestedatt--environment_variables))
 - `executor` (String) Deployment executor
 - `is_cicd_enforced` (Boolean) Deployment CI/CD enforced
 - `is_dag_deploy_enabled` (Boolean) Deployment DAG deploy enabled
-- `is_development_mode` (Boolean) Deployment development mode
-- `is_high_availability` (Boolean) Deployment high availability
 - `name` (String) Deployment name
-- `region` (String) Deployment region - if changing this value, the deployment will be recreated in the new region
-- `resource_quota_cpu` (String) Deployment resource quota CPU
-- `resource_quota_memory` (String) Deployment resource quota memory
-- `scheduler_size` (String) Deployment scheduler size
+- `type` (String) Deployment type - if changing this value, the deployment will be recreated with the new type
 - `workspace_id` (String) Deployment workspace identifier
 
 ### Optional
 
-- `scaling_spec` (Attributes) Deployment scaling spec (see [below for nested schema](#nestedatt--scaling_spec))
+- `cloud_provider` (String) Deployment cloud provider - required for 'STANDARD' deployments. If changing this value, the deployment will be recreated in the new cloud provider
+- `cluster_id` (String) Deployment cluster identifier - required for 'HYBRID' and 'DEDICATED' deployments. If changing this value, the deployment will be recreated in the new cluster
+- `default_task_pod_cpu` (String) Deployment default task pod CPU - required for 'STANDARD' and 'DEDICATED' deployments
+- `default_task_pod_memory` (String) Deployment default task pod memory - required for 'STANDARD' and 'DEDICATED' deployments
+- `is_development_mode` (Boolean) Deployment development mode - required for 'STANDARD' and 'DEDICATED' deployments
+- `is_high_availability` (Boolean) Deployment high availability - required for 'STANDARD' and 'DEDICATED' deployments
+- `region` (String) Deployment region - required for 'STANDARD' deployments. If changing this value, the deployment will be recreated in the new region
+- `resource_quota_cpu` (String) Deployment resource quota CPU - required for 'STANDARD' and 'DEDICATED' deployments
+- `resource_quota_memory` (String) Deployment resource quota memory - required for 'STANDARD' and 'DEDICATED' deployments
+- `scaling_spec` (Attributes) Deployment scaling spec - only for 'STANDARD' and 'DEDICATED' deployments (see [below for nested schema](#nestedatt--scaling_spec))
+- `scheduler_au` (Number) Deployment scheduler AU - required for 'HYBRID' deployments
+- `scheduler_replicas` (Number) Deployment scheduler replicas - required for 'HYBRID' deployments
+- `scheduler_size` (String) Deployment scheduler size - required for 'STANDARD' and 'DEDICATED' deployments
+- `task_pod_node_pool_id` (String) Deployment task pod node pool identifier - required if executor is 'KUBERNETES' and type is 'HYBRID'
 - `worker_queues` (Attributes List) Deployment worker queues (see [below for nested schema](#nestedatt--worker_queues))
 
 ### Read-Only
@@ -58,7 +63,6 @@ Standard Deployment resource
 - `scaling_status` (Attributes) Deployment scaling status (see [below for nested schema](#nestedatt--scaling_status))
 - `scheduler_cpu` (String) Deployment scheduler CPU
 - `scheduler_memory` (String) Deployment scheduler memory
-- `scheduler_replicas` (Number) Deployment scheduler replicas
 - `status` (String) Deployment status
 - `status_reason` (String) Deployment status reason
 - `updated_at` (String) Deployment last updated timestamp
@@ -131,18 +135,22 @@ Optional:
 
 Required:
 
-- `astro_machine` (String)
-- `is_default` (Boolean)
-- `max_worker_count` (Number)
-- `min_worker_count` (Number)
-- `name` (String)
-- `worker_concurrency` (Number)
+- `is_default` (Boolean) Worker queue default
+- `max_worker_count` (Number) Worker queue max worker count
+- `min_worker_count` (Number) Worker queue min worker count
+- `name` (String) Worker queue name
+- `worker_concurrency` (Number) Worker queue worker concurrency
+
+Optional:
+
+- `astro_machine` (String) Worker queue Astro machine value - required for 'STANDARD' and 'DEDICATED' deployments
+- `node_pool_id` (String) Worker queue Node pool identifier - required for 'HYBRID' deployments
 
 Read-Only:
 
-- `id` (String)
-- `pod_cpu` (String)
-- `pod_memory` (String)
+- `id` (String) Worker queue identifier
+- `pod_cpu` (String) Worker queue pod CPU
+- `pod_memory` (String) Worker queue pod memory
 
 
 <a id="nestedatt--created_by"></a>

internal/provider/datasources/data_source_deployments_test.go

@@ -22,8 +22,9 @@ func TestAcc_DataSourceDeployments(t *testing.T) {
 		},
 		ProtoV6ProviderFactories: astronomerprovider.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
+			//Check the data source for deployments for a hosted organization
 			{
-				Config: astronomerprovider.ProviderConfig(t, true) + deployments(deploymentName),
+				Config: astronomerprovider.ProviderConfig(t, true) + hostedDeployments(deploymentName),
 				Check: resource.ComposeTestCheckFunc(
 					// Doing all checks in one step because we do not want to unnecessarily create multiple deployments for the data sources test
 
@@ -84,19 +85,43 @@ func TestAcc_DataSourceDeployments(t *testing.T) {
 			},
 		},
 	})
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			astronomerprovider.TestAccPreCheck(t)
+		},
+		ProtoV6ProviderFactories: astronomerprovider.TestAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			//Check the data source for deployments for a hybrid organization
+			{
+				Config: astronomerprovider.ProviderConfig(t, false) + hybridDeployments(),
+				Check: resource.ComposeTestCheckFunc(
+					// Checks that the deployments data source is not empty and checks the first deployment in the list
+					// has some of the expected attributes
+					checkDeployments("test_data_deployments_hybrid_no_filters", ""),
+				),
+			},
+		},
+	})
+}
+
+func hybridDeployments() string {
+	return `
+data astronomer_deployments "test_data_deployments_hybrid_no_filters" {}`
 }
 
-func deployments(name string) string {
+func hostedDeployments(name string) string {
 	return fmt.Sprintf(`
 resource "astronomer_workspace" "test_workspace" {
 	name = "%v"
 	description = "%v"
 	cicd_enforced_default = true
 }
 
-resource "astronomer_standard_deployment" "test_deployment_kubernetes" {
+resource "astronomer_deployment" "test_deployment_kubernetes" {
 	name = "%v-1"
 	description = "%v"
+	type = "STANDARD"
 	region = "us-east4"
 	cloud_provider = "GCP"
 	contact_emails = ["preview@astronomer.test"]
@@ -118,9 +143,10 @@ resource "astronomer_standard_deployment" "test_deployment_kubernetes" {
 	}]
 }
 
-resource "astronomer_standard_deployment" "test_deployment_celery" {
+resource "astronomer_deployment" "test_deployment_celery" {
 	name = "%v-2"
 	description = "%v"
+	type = "STANDARD"
 	region = "us-east-1"
 	cloud_provider = "AWS"
 	contact_emails = []
@@ -147,46 +173,46 @@ resource "astronomer_standard_deployment" "test_deployment_celery" {
 }
 
 data astronomer_deployment "test_data_deployment_kubernetes" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes]
-	id = astronomer_standard_deployment.test_deployment_kubernetes.id
+	depends_on = [astronomer_deployment.test_deployment_kubernetes]
+	id = astronomer_deployment.test_deployment_kubernetes.id
 }
 
 data astronomer_deployment "test_data_deployment_celery" {
-	depends_on = [astronomer_standard_deployment.test_deployment_celery]
-	id = astronomer_standard_deployment.test_deployment_celery.id
+	depends_on = [astronomer_deployment.test_deployment_celery]
+	id = astronomer_deployment.test_deployment_celery.id
 }
 
 data astronomer_deployments "test_data_deployments_no_filters" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes, astronomer_standard_deployment.test_deployment_celery]
+	depends_on = [astronomer_deployment.test_deployment_kubernetes, astronomer_deployment.test_deployment_celery]
 }
 
 data astronomer_deployments "test_data_deployments_workspace_ids_filter" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes, astronomer_standard_deployment.test_deployment_celery]
+	depends_on = [astronomer_deployment.test_deployment_kubernetes, astronomer_deployment.test_deployment_celery]
 	workspace_ids = [astronomer_workspace.test_workspace.id]
 }
 
 data astronomer_deployments "test_data_deployments_deployment_ids_filter" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes, astronomer_standard_deployment.test_deployment_celery]
-	deployment_ids = [astronomer_standard_deployment.test_deployment_kubernetes.id]
+	depends_on = [astronomer_deployment.test_deployment_kubernetes, astronomer_deployment.test_deployment_celery]
+	deployment_ids = [astronomer_deployment.test_deployment_kubernetes.id]
 }
 
 data astronomer_deployments "test_data_deployments_names_filter" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes, astronomer_standard_deployment.test_deployment_celery]
+	depends_on = [astronomer_deployment.test_deployment_kubernetes, astronomer_deployment.test_deployment_celery]
 	names = ["%v-1"]
 }
 
 data astronomer_deployments "test_data_deployments_incorrect_workspace_ids_filter" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes, astronomer_standard_deployment.test_deployment_celery]
+	depends_on = [astronomer_deployment.test_deployment_kubernetes, astronomer_deployment.test_deployment_celery]
 	workspace_ids = ["%v"]
 }
 
 data astronomer_deployments "test_data_deployments_incorrect_deployment_ids_filter" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes, astronomer_standard_deployment.test_deployment_celery]
+	depends_on = [astronomer_deployment.test_deployment_kubernetes, astronomer_deployment.test_deployment_celery]
 	deployment_ids = ["%v"]
 }
 
 data astronomer_deployments "test_data_deployments_incorrect_names_filter" {
-	depends_on = [astronomer_standard_deployment.test_deployment_kubernetes, astronomer_standard_deployment.test_deployment_celery]
+	depends_on = [astronomer_deployment.test_deployment_kubernetes, astronomer_deployment.test_deployment_celery]
 	names = ["%v"]
 }
 `, name, utils.TestResourceDescription, name, utils.TestResourceDescription, name, utils.TestResourceDescription, name, cuid.New(), cuid.New(), cuid.New())
@@ -230,17 +256,24 @@ func checkDeployments(tfDataSourceName, deploymentName string) resource.TestChec
 		if numDeployments == 0 {
 			return fmt.Errorf("expected deployments to be greater or equal to 1, got %s", instanceState.Attributes["deployments.#"])
 		}
-		deploymentsIdx := -1
-		for i := 0; i < numDeployments; i++ {
-			idxName := fmt.Sprintf("deployments.%d.name", i)
-			if instanceState.Attributes[idxName] == deploymentName {
-				deploymentsIdx = i
-				break
+
+		// If deploymentName is not set, we will check the first deployment
+		var deploymentsIdx int
+		if deploymentName == "" {
+			deploymentsIdx = 0
+		} else {
+			for i := 0; i < numDeployments; i++ {
+				idxName := fmt.Sprintf("deployments.%d.name", i)
+				if instanceState.Attributes[idxName] == deploymentName {
+					deploymentsIdx = i
+					break
+				}
+			}
+			if deploymentsIdx == -1 {
+				return fmt.Errorf("deployment %s not found", deploymentName)
 			}
 		}
-		if deploymentsIdx == -1 {
-			return fmt.Errorf("deployment %s not found", deploymentName)
-		}
+
 		description := fmt.Sprintf("deployments.%d.description", deploymentsIdx)
 		if instanceState.Attributes[description] == "" {
 			return fmt.Errorf("expected 'description' to be set")