generate terraform type before making API call

hashicorp · Feb 1, 2022 · 95cba7e · 95cba7e
1 parent 885967d
commit 95cba7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/manifest/provider/datasource.go b/manifest/provider/datasource.go
@@ -105,6 +105,16 @@ func (s *RawProviderServer) ReadDataSource(ctx context.Context, req *tfprotov5.R
 	}
 	rcl := client.Resource(gvr)
 
+	objectType, err := s.TFTypeFromOpenAPI(ctx, gvk, false)
+	if err != nil {
+		resp.Diagnostics = append(resp.Diagnostics, &tfprotov5.Diagnostic{
+			Severity: tfprotov5.DiagnosticSeverityError,
+			Summary:  "Failed to save resource state",
+			Detail:   err.Error(),
+		})
+		return resp, nil
+	}
+
 	var metadataBlock []tftypes.Value
 	dsConfig["metadata"].As(&metadataBlock)
 
@@ -138,16 +148,6 @@ func (s *RawProviderServer) ReadDataSource(ctx context.Context, req *tfprotov5.R
 		return resp, nil
 	}
 
-	objectType, err := s.TFTypeFromOpenAPI(ctx, gvk, false)
-	if err != nil {
-		resp.Diagnostics = append(resp.Diagnostics, &tfprotov5.Diagnostic{
-			Severity: tfprotov5.DiagnosticSeverityError,
-			Summary:  "Failed to save resource state",
-			Detail:   err.Error(),
-		})
-		return resp, nil
-	}
-
 	fo := RemoveServerSideFields(res.Object)
 	nobj, err := payload.ToTFValue(fo, objectType, tftypes.NewAttributePath())
 	if err != nil {

diff --git a/manifest/test/acceptance/datasource_test.go b/manifest/test/acceptance/datasource_test.go
@@ -62,7 +62,7 @@ func TestDataSourceKubernetesResource_ConfigMap(t *testing.T) {
 
 	tfstate := tfstatehelper.NewHelper(step2.RequireState(t))
 
-	// check the data source 
+	// check the data source
 	tfstate.AssertAttributeValues(t, tfstatehelper.AttributeValues{
 		"data.kubernetes_resource.test_config.object.data.TEST": "hello world",
 	})