steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make BundleToTerraform function private

This commit is contained in:
Shreyas Goenka 2024-05-02 20:36:08 +02:00
parent 4724ecb324
commit 8d89ccc519
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundle/deploy/terraform/convert.go
View File

@ -63,12 +63,13 @@ func convGrants(acl []resources.Grant) *schema.ResourceGrants {
return &resource return &resource
} }
// BundleToTerraform converts resources in a bundle configuration // bundleToTerraformLegacy converts resources in a bundle configuration
// to the equivalent Terraform JSON representation. // to the equivalent Terraform JSON representation.
// //
// NOTE: THIS IS CURRENTLY A HACK. WE NEED A BETTER WAY TO // NOTE: This is the old implementation. We now use the new (ie dynamic) implementation
// CONVERT TO/FROM TERRAFORM COMPATIBLE FORMAT. // at BundleToTerraformWithDynValue. This function is kept around to ensure equivalence
func BundleToTerraform(config *config.Root) *schema.Root { // between the output of the two implementations.
func bundleToTerraformLegacy(config *config.Root) *schema.Root {
tfroot := schema.NewRoot() tfroot := schema.NewRoot()
tfroot.Provider = schema.NewProviders() tfroot.Provider = schema.NewProviders()
tfroot.Resource = schema.NewResources() tfroot.Resource = schema.NewResources()

30
bundle/deploy/terraform/convert_test.go
View File

@ -58,7 +58,7 @@ func TestBundleToTerraformJob(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Job["my_job"].(*schema.ResourceJob) resource := out.Resource.Job["my_job"].(*schema.ResourceJob)
assert.Equal(t, "my job", resource.Name) assert.Equal(t, "my job", resource.Name)
@ -90,7 +90,7 @@ func TestBundleToTerraformJobPermissions(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Permissions["job_my_job"].(*schema.ResourcePermissions) resource := out.Resource.Permissions["job_my_job"].(*schema.ResourcePermissions)
assert.NotEmpty(t, resource.JobId) assert.NotEmpty(t, resource.JobId)
@ -128,7 +128,7 @@ func TestBundleToTerraformJobTaskLibraries(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Job["my_job"].(*schema.ResourceJob) resource := out.Resource.Job["my_job"].(*schema.ResourceJob)
assert.Equal(t, "my job", resource.Name) assert.Equal(t, "my job", resource.Name)
@ -172,7 +172,7 @@ func TestBundleToTerraformForEachTaskLibraries(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Job["my_job"].(*schema.ResourceJob) resource := out.Resource.Job["my_job"].(*schema.ResourceJob)
assert.Equal(t, "my job", resource.Name) assert.Equal(t, "my job", resource.Name)
@ -230,7 +230,7 @@ func TestBundleToTerraformPipeline(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Pipeline["my_pipeline"].(*schema.ResourcePipeline) resource := out.Resource.Pipeline["my_pipeline"].(*schema.ResourcePipeline)
assert.Equal(t, "my pipeline", resource.Name) assert.Equal(t, "my pipeline", resource.Name)
@ -263,7 +263,7 @@ func TestBundleToTerraformPipelinePermissions(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Permissions["pipeline_my_pipeline"].(*schema.ResourcePermissions) resource := out.Resource.Permissions["pipeline_my_pipeline"].(*schema.ResourcePermissions)
assert.NotEmpty(t, resource.PipelineId) assert.NotEmpty(t, resource.PipelineId)
@ -300,7 +300,7 @@ func TestBundleToTerraformModel(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.MlflowModel["my_model"].(*schema.ResourceMlflowModel) resource := out.Resource.MlflowModel["my_model"].(*schema.ResourceMlflowModel)
assert.Equal(t, "name", resource.Name) assert.Equal(t, "name", resource.Name)
@ -336,7 +336,7 @@ func TestBundleToTerraformModelPermissions(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Permissions["mlflow_model_my_model"].(*schema.ResourcePermissions) resource := out.Resource.Permissions["mlflow_model_my_model"].(*schema.ResourcePermissions)
assert.NotEmpty(t, resource.RegisteredModelId) assert.NotEmpty(t, resource.RegisteredModelId)
@ -362,7 +362,7 @@ func TestBundleToTerraformExperiment(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.MlflowExperiment["my_experiment"].(*schema.ResourceMlflowExperiment) resource := out.Resource.MlflowExperiment["my_experiment"].(*schema.ResourceMlflowExperiment)
assert.Equal(t, "name", resource.Name) assert.Equal(t, "name", resource.Name)
@ -392,7 +392,7 @@ func TestBundleToTerraformExperimentPermissions(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Permissions["mlflow_experiment_my_experiment"].(*schema.ResourcePermissions) resource := out.Resource.Permissions["mlflow_experiment_my_experiment"].(*schema.ResourcePermissions)
assert.NotEmpty(t, resource.ExperimentId) assert.NotEmpty(t, resource.ExperimentId)
@ -436,7 +436,7 @@ func TestBundleToTerraformModelServing(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.ModelServing["my_model_serving_endpoint"].(*schema.ResourceModelServing) resource := out.Resource.ModelServing["my_model_serving_endpoint"].(*schema.ResourceModelServing)
assert.Equal(t, "name", resource.Name) assert.Equal(t, "name", resource.Name)
@ -472,7 +472,7 @@ func TestBundleToTerraformModelServingPermissions(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Permissions["model_serving_my_model_serving_endpoint"].(*schema.ResourcePermissions) resource := out.Resource.Permissions["model_serving_my_model_serving_endpoint"].(*schema.ResourcePermissions)
assert.NotEmpty(t, resource.ServingEndpointId) assert.NotEmpty(t, resource.ServingEndpointId)
@ -501,7 +501,7 @@ func TestBundleToTerraformRegisteredModel(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.RegisteredModel["my_registered_model"].(*schema.ResourceRegisteredModel) resource := out.Resource.RegisteredModel["my_registered_model"].(*schema.ResourceRegisteredModel)
assert.Equal(t, "name", resource.Name) assert.Equal(t, "name", resource.Name)
@ -536,7 +536,7 @@ func TestBundleToTerraformRegisteredModelGrants(t *testing.T) {
}, },
} }
out := BundleToTerraform(&config) out := bundleToTerraformLegacy(&config)
resource := out.Resource.Grants["registered_model_my_registered_model"].(*schema.ResourceGrants) resource := out.Resource.Grants["registered_model_my_registered_model"].(*schema.ResourceGrants)
assert.NotEmpty(t, resource.Function) assert.NotEmpty(t, resource.Function)
@ -979,7 +979,7 @@ func assertEqualTerraformRoot(t *testing.T, a, b *schema.Root) {
func bundleToTerraformEquivalenceTest(t *testing.T, config *config.Root) { func bundleToTerraformEquivalenceTest(t *testing.T, config *config.Root) {
t.Run("dyn equivalence", func(t *testing.T) { t.Run("dyn equivalence", func(t *testing.T) {
tf1 := BundleToTerraform(config) tf1 := bundleToTerraformLegacy(config)
vin, err := convert.FromTyped(config, dyn.NilValue) vin, err := convert.FromTyped(config, dyn.NilValue)
require.NoError(t, err) require.NoError(t, err)