ds/ec_deployments: Add _ref_id to all resources

.changelog/362.txt

@@ -1,3 +1,3 @@
 ```release-note:enhancement
-datasource/ec_deployments: Adds to new fields, `deployments.#.name` and `deployments.#.alias` to the data source.
+datasource/ec_deployments: Adds two new fields, `deployments.#.name` and `deployments.#.alias` to the data source.
 ```

.changelog/380.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+datasource/ec_deployments: Adds four new fields, `deployments.#.elasticsearch_ref_id`, `deployments.#.kibana_ref_id`, `deployments.#.apm_ref_id`, `deployments.#.enterprise_search_ref_id` to the data source.
+```

docs/data-sources/ec_deployments.md

@@ -73,6 +73,10 @@ These will not be available for interpolation.
   * `deployments.#.alias` - Deployment alias.
   * `deployments.#.name` - The name of the deployment.
   * `deployments.#.elasticsearch_resource_id` - The Elasticsearch resource unique ID.
+  * `deployments.#.elasticsearch_ref_id` - The Elasticsearch resource reference.
   * `deployments.#.kibana_resource_id` - The Kibana resource unique ID.
+  * `deployments.#.kibana_ref_id` - The Kibana resource reference.
   * `deployments.#.apm_resource_id` - The APM resource unique ID.
+  * `deployments.#.apm_ref_id` - The APM resource reference.
   * `deployments.#.enterprise_search_resource_id` - The Enterprise Search resource unique ID.
+  * `deployments.#.enterprise_search_ref_id` - The Enterprise Search resource reference.

ec/acc/datasource_deployment_basic_test.go

@@ -118,6 +118,12 @@ func TestAccDatasourceDeployment_basic(t *testing.T) {
 					resource.TestCheckResourceAttrPair(depsDatasourceName, "deployments.0.kibana_resource_id", resourceName, "kibana.0.resource_id"),
 					resource.TestCheckResourceAttrPair(depsDatasourceName, "deployments.0.apm_resource_id", resourceName, "apm.0.resource_id"),
 					resource.TestCheckResourceAttrPair(depsDatasourceName, "deployments.0.enterprise_search_resource_id", resourceName, "enterprise_search.0.resource_id"),
+
+					// Ref ID check.
+					resource.TestCheckResourceAttrPair(depsDatasourceName, "deployments.0.elasticsearch_ref_id", resourceName, "elasticsearch.0.ref_id"),
+					resource.TestCheckResourceAttrPair(depsDatasourceName, "deployments.0.kibana_ref_id", resourceName, "kibana.0.ref_id"),
+					resource.TestCheckResourceAttrPair(depsDatasourceName, "deployments.0.apm_ref_id", resourceName, "apm.0.ref_id"),
+					resource.TestCheckResourceAttrPair(depsDatasourceName, "deployments.0.enterprise_search_ref_id", resourceName, "enterprise_search.0.ref_id"),
 				),
 			},
 		},

ec/ecdatasource/deploymentsdatasource/datasource.go

@@ -90,18 +90,22 @@ func modelToState(d *schema.ResourceData, res *models.DeploymentsSearchResponse)
 
 		if len(deployment.Resources.Elasticsearch) > 0 {
 			m["elasticsearch_resource_id"] = *deployment.Resources.Elasticsearch[0].ID
+			m["elasticsearch_ref_id"] = *deployment.Resources.Elasticsearch[0].RefID
 		}
 
 		if len(deployment.Resources.Kibana) > 0 {
 			m["kibana_resource_id"] = *deployment.Resources.Kibana[0].ID
+			m["kibana_ref_id"] = *deployment.Resources.Kibana[0].RefID
 		}
 
 		if len(deployment.Resources.Apm) > 0 {
 			m["apm_resource_id"] = *deployment.Resources.Apm[0].ID
+			m["apm_ref_id"] = *deployment.Resources.Apm[0].RefID
 		}
 
 		if len(deployment.Resources.EnterpriseSearch) > 0 {
 			m["enterprise_search_resource_id"] = *deployment.Resources.EnterpriseSearch[0].ID
+			m["enterprise_search_ref_id"] = *deployment.Resources.EnterpriseSearch[0].RefID
 		}
 
 		result = append(result, m)

ec/ecdatasource/deploymentsdatasource/datasource_test.go

@@ -47,10 +47,14 @@ func Test_modelToState(t *testing.T) {
 				"name":                          "test-hello",
 				"alias":                         "dev",
 				"apm_resource_id":               "9884c76ae1cd4521a0d9918a454a700d",
+				"apm_ref_id":                    "apm",
 				"deployment_id":                 "a8f22a9b9e684a7f94a89df74aa14331",
 				"elasticsearch_resource_id":     "a98dd0dac15a48d5b3953384c7e571b9",
+				"elasticsearch_ref_id":          "elasticsearch",
 				"enterprise_search_resource_id": "f17e4d8a61b14c12b020d85b723357ba",
+				"enterprise_search_ref_id":      "enterprise_search",
 				"kibana_resource_id":            "c75297d672b54da68faecededf372f87",
+				"kibana_ref_id":                 "kibana",
 			}},
 		},
 		Schema: newSchema(),
@@ -67,7 +71,8 @@ func Test_modelToState(t *testing.T) {
 				Resources: &models.DeploymentResources{
 					Elasticsearch: []*models.ElasticsearchResourceInfo{
 						{
-							ID: ec.String("a98dd0dac15a48d5b3953384c7e571b9"),
+							RefID: ec.String("elasticsearch"),
+							ID:    ec.String("a98dd0dac15a48d5b3953384c7e571b9"),
 							Info: &models.ElasticsearchClusterInfo{
 								Healthy: ec.Bool(true),
 								PlanInfo: &models.ElasticsearchClusterPlansInfo{
@@ -83,13 +88,22 @@ func Test_modelToState(t *testing.T) {
 						},
 					},
 					Kibana: []*models.KibanaResourceInfo{
-						{ID: ec.String("c75297d672b54da68faecededf372f87")},
+						{
+							ID:    ec.String("c75297d672b54da68faecededf372f87"),
+							RefID: ec.String("kibana"),
+						},
 					},
 					Apm: []*models.ApmResourceInfo{
-						{ID: ec.String("9884c76ae1cd4521a0d9918a454a700d")},
+						{
+							ID:    ec.String("9884c76ae1cd4521a0d9918a454a700d"),
+							RefID: ec.String("apm"),
+						},
 					},
 					EnterpriseSearch: []*models.EnterpriseSearchResourceInfo{
-						{ID: ec.String("f17e4d8a61b14c12b020d85b723357ba")},
+						{
+							ID:    ec.String("f17e4d8a61b14c12b020d85b723357ba"),
+							RefID: ec.String("enterprise_search"),
+						},
 					},
 				},
 			},
@@ -103,7 +117,7 @@ func Test_modelToState(t *testing.T) {
 	_ = deploymentsSchemaArgNoID.Set("deployment_template_id", "azure-compute-optimized")
 
 	wantDeploymentsNoID := util.NewResourceData(t, util.ResDataParams{
-		ID: "3138173215",
+		ID: "2553442026",
 		State: map[string]interface{}{
 			"id":                     "myID",
 			"name_prefix":            "test",
@@ -114,10 +128,14 @@ func Test_modelToState(t *testing.T) {
 				"name":                          "test-hello",
 				"alias":                         "dev",
 				"apm_resource_id":               "9884c76ae1cd4521a0d9918a454a700d",
+				"apm_ref_id":                    "apm",
 				"deployment_id":                 "a8f22a9b9e684a7f94a89df74aa14331",
 				"elasticsearch_resource_id":     "a98dd0dac15a48d5b3953384c7e571b9",
+				"elasticsearch_ref_id":          "elasticsearch",
 				"enterprise_search_resource_id": "f17e4d8a61b14c12b020d85b723357ba",
+				"enterprise_search_ref_id":      "enterprise_search",
 				"kibana_resource_id":            "c75297d672b54da68faecededf372f87",
+				"kibana_ref_id":                 "kibana",
 			}},
 		},
 		Schema: newSchema(),

ec/ecdatasource/deploymentsdatasource/schema.go

@@ -104,18 +104,34 @@ func newDeploymentList() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"elasticsearch_ref_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"kibana_resource_id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"kibana_ref_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"apm_resource_id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"apm_ref_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"enterprise_search_resource_id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enterprise_search_ref_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }