Merge pull request #2243 from keboola/petr-hosek-PSGO-1005

Update templates tests

internal/pkg/service/cli/dialog/use_template.go

@@ -61,7 +61,7 @@ func (d *useTmplInputsDialog) ask(ctx context.Context, isForTest bool, inputsFil
 	err := d.groups.VisitInputs(func(group *input.StepsGroupExt, step *input.StepExt, inputDef *input.Input) error {
 		// Print info about group and select steps
 		if !group.Announced {
-			if err := d.announceGroup(group); err != nil {
+			if err := d.announceGroup(group, isForTest); err != nil {
 				return err
 			}
 		}
@@ -116,7 +116,7 @@ func (d *useTmplInputsDialog) ask(ctx context.Context, isForTest bool, inputsFil
 	return d.out, warnings, err
 }
 
-func (d *useTmplInputsDialog) announceGroup(group *input.StepsGroupExt) error {
+func (d *useTmplInputsDialog) announceGroup(group *input.StepsGroupExt, isForTest bool) error {
 	// Only once
 	if group.Announced {
 		return nil
@@ -147,8 +147,9 @@ func (d *useTmplInputsDialog) announceGroup(group *input.StepsGroupExt) error {
 				}
 			}
 		}
-	case !group.AreStepsSelectable():
+	case !group.AreStepsSelectable() || isForTest:
 		// Are all steps required? -> skip select box
+		// Want to test all cases for template test
 		for stepIndex := range group.Steps {
 			selectedSteps = append(selectedSteps, stepIndex)
 		}
@@ -173,7 +174,7 @@ func (d *useTmplInputsDialog) announceGroup(group *input.StepsGroupExt) error {
 	}
 
 	// Validate steps count
-	if err := group.ValidateStepsCount(len(group.Steps), len(selectedSteps)); err != nil {
+	if err := group.ValidateStepsCount(len(group.Steps), len(selectedSteps)); err != nil && !isForTest {
 		details := errors.NewMultiError()
 		details.Append(err)
 		details.Append(errors.Errorf("number of selected steps (%d) is incorrect", len(selectedSteps)))

internal/pkg/template/test/inputs.go

@@ -24,8 +24,8 @@ func ReadInputValues(ctx context.Context, tmpl *template.Template, test *templat
 	inputValues := make(template.InputsValues, 0)
 	err = tmpl.Inputs().ToExtended().VisitInputs(func(group *input.StepsGroupExt, step *input.StepExt, inputDef *input.Input) error {
 		var inputValue template.InputValue
-		if v, found := inputsFile[inputDef.ID]; found {
-			inputValue, err = template.ParseInputValue(ctx, v, inputDef, true)
+		if value, found := inputsFile[inputDef.ID]; found {
+			inputValue, err = template.ParseInputValue(ctx, value, inputDef, true)
 			if err != nil {
 				return errors.NewNestedError(err, errors.New("please fix the value in the inputs JSON file"))
 			}

test/cli/template-test-create/create-test-exactlyOne/args

@@ -0,0 +1 @@
+template test create my-template 0.0.1 --test-name one --inputs-file ./inputs.json --test-projects-file ./projects.json

test/cli/template-test-create/create-test-exactlyOne/env

@@ -0,0 +1,2 @@
+TEST_KBC_PROJECTS_LOCK_DIR_NAME=.kac-cli-e2e-test-template-test
+

test/cli/template-test-create/create-test-exactlyOne/expected-code

@@ -0,0 +1 @@
+0

test/cli/template-test-create/create-test-exactlyOne/expected-stdout

@@ -0,0 +1,6 @@
+Objects from "keboola/my-template/0.0.1" template:
+  + C main/extractor/ex-generic-v2/empty-instance
+  + C main/extractor/keboola.ex-db-mysql/with-rows
+  + R main/extractor/keboola.ex-db-mysql/with-rows/rows/users
+Template "keboola/my-template/0.0.1" has been applied, instance ID: %s
+The test was created in folder tests/one.

test/cli/template-test-create/create-test-exactlyOne/in/.keboola/repository.json

@@ -0,0 +1,26 @@
+{
+  "version": 2,
+  "author": {
+    "name": "Example Author",
+    "url": "https://example.com"
+  },
+  "templates": [
+    {
+      "id": "my-template",
+      "name": "My Template",
+      "description": "Full workflow to ...",
+      "path": "my-template",
+      "versions": [
+        {
+          "version": "0.0.1",
+          "description": "notes",
+          "stable": false,
+          "components": [
+            "keboola.ex-facebook"
+          ],
+          "path": "v0"
+        }
+      ]
+    }
+  ]
+}

test/cli/template-test-create/create-test-exactlyOne/in/inputs.json

@@ -0,0 +1,6 @@
+{
+  "ex-db-mysql-db-host": "host",
+  "ex-db-mysql-db-password": "##KBC_SECRET_PASSWORD##",
+  "ex-db-mysql-incremental": false,
+  "ex-generic-v2-api-base-url": "https://jsonplaceholder.typicode.com"
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/README.md

@@ -0,0 +1,4 @@
+### My Template
+
+Full workflow to ...
+

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/description.md

@@ -0,0 +1,10 @@
+# My Template
+
+## Extended description 
+- of a template for demo purposes 
+- from the examples in the API documentation
+
+## Some Example
+```
+    with.a.code()
+```

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/ex-generic-v2/empty/config.jsonnet

@@ -0,0 +1,7 @@
+{
+  parameters: {
+    api: {
+      baseUrl: Input("ex-generic-v2-api-base-url"),
+    },
+  },
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/ex-generic-v2/empty/description.md

@@ -0,0 +1 @@
+test fixture

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/ex-generic-v2/empty/meta.jsonnet

@@ -0,0 +1,3 @@
+{
+  name: "empty " + InstanceIdShort(),
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/config.jsonnet

@@ -0,0 +1,8 @@
+{
+  parameters: {
+    db: {
+      host: Input("ex-db-mysql-db-host"),
+      "#password": Input("ex-db-mysql-db-password"),
+    },
+  },
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/description.md

@@ -0,0 +1 @@
+test fixture

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/meta.jsonnet

@@ -0,0 +1,3 @@
+{
+  name: "with-rows",
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/rows/users/config.jsonnet

@@ -0,0 +1,5 @@
+{
+  parameters: {
+    incremental: Input("ex-db-mysql-incremental"),
+  },
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/rows/users/description.md

@@ -0,0 +1 @@
+test fixture

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/rows/users/meta.jsonnet

@@ -0,0 +1,4 @@
+{
+  name: "users",
+  isDisabled: false,
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/inputs.jsonnet

@@ -0,0 +1,69 @@
+{
+  stepsGroups: [
+    {
+      description: "Default Group",
+      required: "exactlyOne",
+      steps: [
+        {
+          icon: "common:settings",
+          name: "Default Step 1",
+          description: "Default Step 1",
+          inputs: [
+            {
+              id: "ex-generic-v2-api-base-url",
+              name: "Api BaseUrl",
+              description: "a",
+              type: "string",
+              kind: "input",
+              default: "https://jsonplaceholder.typicode.com",
+            },
+          ],
+        },
+        {
+          icon: "common:settings",
+          name: "Default Step 2",
+          description: "Default Step 2",
+          inputs: [
+            {
+              id: "ex-db-mysql-db-host",
+              name: "Db Host",
+              description: "b",
+              type: "string",
+              kind: "input",
+              default: "mysql.example.com",
+            },
+          ],
+        },
+        {
+          icon: "common:settings",
+          name: "Default Step 3",
+          description: "Default Step 3",
+          inputs: [
+            {
+              id: "ex-db-mysql-incremental",
+              name: "Incremental",
+              description: "c",
+              type: "bool",
+              kind: "confirm",
+              default: false,
+            },
+          ],
+        },
+        {
+          icon: "common:settings",
+          name: "Default Step 4",
+          description: "Default Step 4",
+          inputs: [
+            {
+              id: "ex-db-mysql-db-password",
+              name: "Db Pass",
+              description: "b",
+              type: "string",
+              kind: "hidden",
+            },
+          ],
+        },
+      ],
+    },
+  ],
+}

test/cli/template-test-create/create-test-exactlyOne/in/my-template/v0/src/manifest.jsonnet

@@ -0,0 +1,21 @@
+{
+  configurations: [
+    {
+      componentId: "ex-generic-v2",
+      id: ConfigId("empty"),
+      path: "extractor/ex-generic-v2/empty",
+      rows: [],
+    },
+    {
+      componentId: "keboola.ex-db-mysql",
+      id: ConfigId("with-rows"),
+      path: "extractor/keboola.ex-db-mysql/with-rows",
+      rows: [
+        {
+          id: ConfigRowId("users"),
+          path: "rows/users",
+        },
+      ],
+    },
+  ],
+}

test/cli/template-test-create/create-test-exactlyOne/in/projects.json

@@ -0,0 +1,9 @@
+[
+  {
+    "host": "%%TEST_KBC_STORAGE_API_HOST%%",
+    "project":%%TEST_KBC_PROJECT_ID%%,
+    "stagingStorage": "%%TEST_KBC_PROJECT_STAGING_STORAGE%%",
+    "backend": "%%TEST_KBC_PROJECT_BACKEND%%",
+    "token": "%%TEST_KBC_STORAGE_API_TOKEN%%"
+  }
+]

test/cli/template-test-create/create-test-exactlyOne/initial-state.json

@@ -0,0 +1,11 @@
+{
+  "allBranchesConfigs": [],
+  "branches": [
+    {
+      "branch": {
+        "name": "Main",
+        "isDefault": true
+      }
+    }
+  ]
+}

test/cli/template-test-create/create-test-exactlyOne/out/.keboola/repository.json

@@ -0,0 +1,26 @@
+{
+  "version": 2,
+  "author": {
+    "name": "Example Author",
+    "url": "https://example.com"
+  },
+  "templates": [
+    {
+      "id": "my-template",
+      "name": "My Template",
+      "description": "Full workflow to ...",
+      "path": "my-template",
+      "versions": [
+        {
+          "version": "0.0.1",
+          "description": "notes",
+          "stable": false,
+          "components": [
+            "keboola.ex-facebook"
+          ],
+          "path": "v0"
+        }
+      ]
+    }
+  ]
+}

test/cli/template-test-create/create-test-exactlyOne/out/inputs.json

@@ -0,0 +1,6 @@
+{
+  "ex-db-mysql-db-host": "host",
+  "ex-db-mysql-db-password": "##KBC_SECRET_PASSWORD##",
+  "ex-db-mysql-incremental": false,
+  "ex-generic-v2-api-base-url": "https://jsonplaceholder.typicode.com"
+}

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/README.md

@@ -0,0 +1,4 @@
+### My Template
+
+Full workflow to ...
+

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/description.md

@@ -0,0 +1,10 @@
+# My Template
+
+## Extended description 
+- of a template for demo purposes 
+- from the examples in the API documentation
+
+## Some Example
+```
+    with.a.code()
+```

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/ex-generic-v2/empty/config.jsonnet

@@ -0,0 +1,7 @@
+{
+  parameters: {
+    api: {
+      baseUrl: Input("ex-generic-v2-api-base-url"),
+    },
+  },
+}

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/ex-generic-v2/empty/description.md

@@ -0,0 +1 @@
+test fixture

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/ex-generic-v2/empty/meta.jsonnet

@@ -0,0 +1,3 @@
+{
+  name: "empty " + InstanceIdShort(),
+}

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/config.jsonnet

@@ -0,0 +1,8 @@
+{
+  parameters: {
+    db: {
+      host: Input("ex-db-mysql-db-host"),
+      "#password": Input("ex-db-mysql-db-password"),
+    },
+  },
+}

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/description.md

@@ -0,0 +1 @@
+test fixture

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/meta.jsonnet

@@ -0,0 +1,3 @@
+{
+  name: "with-rows",
+}

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/rows/users/config.jsonnet

@@ -0,0 +1,5 @@
+{
+  parameters: {
+    incremental: Input("ex-db-mysql-incremental"),
+  },
+}

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/rows/users/description.md

@@ -0,0 +1 @@
+test fixture

test/cli/template-test-create/create-test-exactlyOne/out/my-template/v0/src/extractor/keboola.ex-db-mysql/with-rows/rows/users/meta.jsonnet

@@ -0,0 +1,4 @@
+{
+  name: "users",
+  isDisabled: false,
+}