refactor deployer discriminator to deployer_id

arcalot · Oct 27, 2023 · 0660e38 · 0660e38
1 parent 2e8b44d
commit 0660e38
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/config/load_test.go b/config/load_test.go
@@ -19,8 +19,8 @@ var configLoadData = map[string]struct {
 		expectedOutput: &config.Config{
 			TypeHintPlugins: nil,
 			LocalDeployers: config.LocalDeployers{
-				Image:  map[string]string{"type": "docker"},
-				Python: map[string]string{"type": "python"},
+				Image:  map[string]string{"deployer_id": "docker"},
+				Python: map[string]string{"deployer_id": "python"},
 			},
 			Log: log.Config{
 				Level:       log.LevelInfo,
@@ -36,8 +36,8 @@ log:
 		expectedOutput: &config.Config{
 			TypeHintPlugins: nil,
 			LocalDeployers: config.LocalDeployers{
-				Image:  map[string]string{"type": "docker"},
-				Python: map[string]string{"type": "python"},
+				Image:  map[string]string{"deployer_id": "docker"},
+				Python: map[string]string{"deployer_id": "python"},
 			},
 			Log: log.Config{
 				Level:       log.LevelDebug,
@@ -54,8 +54,8 @@ deployers:
 		expectedOutput: &config.Config{
 			TypeHintPlugins: nil,
 			LocalDeployers: config.LocalDeployers{
-				Image:  map[string]string{"type": "kubernetes"},
-				Python: map[string]string{"type": "python"},
+				Image:  map[string]string{"deployer_id": "kubernetes"},
+				Python: map[string]string{"deployer_id": "python"},
 			},
 			Log: log.Config{
 				Level:       log.LevelInfo,
@@ -73,8 +73,8 @@ plugins:
 				"quay.io/arcalot/example-plugin:latest",
 			},
 			LocalDeployers: config.LocalDeployers{
-				Image:  map[string]string{"type": "docker"},
-				Python: map[string]string{"type": "python"},
+				Image:  map[string]string{"deployer_id": "docker"},
+				Python: map[string]string{"deployer_id": "python"},
 			},
 			Log: log.Config{
 				Level:       log.LevelInfo,

diff --git a/internal/step/plugin/provider.go b/internal/step/plugin/provider.go
@@ -98,7 +98,7 @@ func (p *pluginProvider) ProviderSchema() map[string]*schema.PropertySchema {
 			nil,
 			[]string{"\"quay.io/arcaflow/example-plugin:latest\""},
 		),
-		"type": schema.NewPropertySchema(
+		"deployer_id": schema.NewPropertySchema(
 			schema.NewStringSchema(schema.PointerTo[int64](1), nil, nil),
 			schema.NewDisplayValue(
 				schema.PointerTo("Type"),

diff --git a/internal/step/plugin/provider_test.go b/internal/step/plugin/provider_test.go
@@ -122,12 +122,12 @@ func TestProvider_MultipleDeployers(t *testing.T) {
 	deployTimeMs := 20
 	workflowDeployerCfg := map[string]any{
 		"image": map[string]any{
-			"type":           "test-impl",
+			"deployer_id":    "test-impl",
 			"deploy_time":    deployTimeMs,
 			"deploy_succeed": true,
 		},
 		"python": map[string]any{
-			"type": "test-impl",
+			"deployer_id": "test-impl",
 		},
 	}
 
@@ -144,8 +144,8 @@ func TestProvider_MultipleDeployers(t *testing.T) {
 
 	stepSchema := map[string]any{
 		"plugin": map[string]string{
-			"src":  "simulation",
-			"type": "image",
+			"src":         "simulation",
+			"deployer_id": "image",
 		},
 	}
 	byteSchema := map[string][]byte{}
@@ -168,7 +168,7 @@ func TestProvider_MultipleDeployers(t *testing.T) {
 
 func TestProvider_Utility(t *testing.T) {
 	workflowDeployerCfg := map[string]any{
-		"image": map[string]any{"type": "test-impl"},
+		"image": map[string]any{"deployer_id": "test-impl"},
 	}
 
 	plp, err := plugin.New(
@@ -220,7 +220,7 @@ func TestProvider_HappyError(t *testing.T) {
 		},
 	)
 	workflowDeployerCfg := map[string]any{
-		"image": map[string]any{"type": "test-impl"},
+		"image": map[string]any{"deployer_id": "test-impl"},
 	}
 
 	deployerRegistry := deployer_registry.New(
@@ -270,22 +270,22 @@ func TestProvider_HappyError(t *testing.T) {
 	assert.Error(t, running.ProvideStageInput(
 		string(plugin.StageIDDeploy),
 		map[string]any{"deploy": map[string]any{
-			"type":        "test-impl",
+			"deployer_id": "test-impl",
 			"deploy_time": "abc"}},
 	))
 
 	assert.NoError(t, running.ProvideStageInput(
 		string(plugin.StageIDDeploy),
 		map[string]any{"deploy": map[string]any{
-			"type":        "test-impl",
+			"deployer_id": "test-impl",
 			"deploy_time": 1}},
 	))
 
 	// provide deploy input a 2nd time
 	assert.Error(t, running.ProvideStageInput(
 		string(plugin.StageIDDeploy),
 		map[string]any{"deploy": map[string]any{
-			"type":        "test-impl",
+			"deployer_id": "test-impl",
 			"deploy_time": nil}},
 	))
 
@@ -336,7 +336,7 @@ func TestProvider_VerifyCancelSignal(t *testing.T) {
 		},
 	)
 	workflowDeployerCfg := map[string]any{
-		"type": "test-impl",
+		"deployer_id": "test-impl",
 	}
 
 	deployerRegistry := deployer_registry.New(
@@ -392,13 +392,13 @@ func TestProvider_DeployFail(t *testing.T) {
 		deployer.Any(testdeployer.NewFactory()))
 	deployTimeMs := 20
 	workflowDeployerCfg := map[string]any{
-		"image":          map[string]any{"type": "test-impl"},
+		"image":          map[string]any{"deployer_id": "test-impl"},
 		"deploy_time":    deployTimeMs,
 		"deploy_succeed": true,
 	}
 
 	_ := map[string]any{
-		"type":           "test-impl",
+		"deployer_id":    "test-impl",
 		"deploy_time":    deployTimeMs,
 		"deploy_succeed": true,
 	}
@@ -474,7 +474,7 @@ func TestProvider_StartFail(t *testing.T) {
 	//	"deploy_succeed": true,
 	//}
 	workflowDeployerCfg := map[string]any{
-		"image": map[string]any{"type": "test-impl"},
+		"image": map[string]any{"deployer_id": "test-impl"},
 		//"deploy_time":    deployTimeMs,
 		//"deploy_succeed": true,
 	}
@@ -508,7 +508,7 @@ func TestProvider_StartFail(t *testing.T) {
 	assert.NoError(t, running.ProvideStageInput(
 		string(plugin.StageIDDeploy),
 		map[string]any{"deploy": map[string]any{
-			"type":                  "test-impl",
+			"deployer_id":           "test-impl",
 			"deploy_succeed":        true,
 			"deploy_time":           deployTimeMs,
 			"disable_plugin_writes": true}},

diff --git a/workflow/executor_test.go b/workflow/executor_test.go
@@ -64,7 +64,7 @@ func NewTestImplStepRegistry(
 
 	pluginProvider := assert.NoErrorR[step.Provider](t)(
 		plugin.New(logger, deployerRegistry, map[string]interface{}{
-			"type":        "test-impl",
+			"deployer_id": "test-impl",
 			"deploy_time": "0",
 		}),
 	)