acc: Simplify integration_whl tests (#2479)

## Changes
Instead of full templates, only template databricks.yml and use envsubst
for that.

Author: denik

…on_whl/base/template/databricks.yml.tmpl …integration_whl/base/databricks.yml.tmplacceptance/bundle/integration_whl/base/template/databricks.yml.tmpl renamed to acceptance/bundle/integration_whl/base/databricks.yml.tmpl acceptance/bundle/integration_whl/base/template/databricks.yml.tmpl renamed to acceptance/bundle/integration_whl/base/databricks.yml.tmpl

@@ -2,25 +2,23 @@ bundle:
   name: wheel-task
 
 workspace:
-  root_path: "~/.bundle/{{.unique_id}}"
+  root_path: "~/.bundle/$UNIQUE_NAME"
 
-{{if .python_wheel_wrapper}}
-experimental:
-  python_wheel_wrapper: true
-{{end}}
+include:
+  - $EXTRA_CONFIG
 
 resources:
   jobs:
     some_other_job:
-      name: "[${bundle.target}] Test Wheel Job {{.unique_id}}"
+      name: "[${bundle.target}] Test Wheel Job $UNIQUE_NAME"
       tasks:
         - task_key: TestTask
           new_cluster:
             num_workers: 1
-            spark_version: "{{.spark_version}}"
-            node_type_id: "{{.node_type_id}}"
+            spark_version: $DEFAULT_SPARK_VERSION
+            node_type_id: $NODE_TYPE_ID
             data_security_mode: USER_ISOLATION
-            instance_pool_id: "{{.instance_pool_id}}"
+            instance_pool_id: $TEST_INSTANCE_POOL_ID
           python_wheel_task:
             package_name: my_test_code
             entry_point: run

acceptance/bundle/integration_whl/base/databricks_template_schema.json

@@ -1,23 +1,13 @@
 
->>> cat input.json
-{
-    "project_name": "my_test_code",
-    "spark_version": "13.3.x-snapshot-scala2.12",
-    "node_type_id": "[NODE_TYPE_ID]",
-    "unique_id": "[UNIQUE_NAME]",
-    "python_wheel_wrapper": false,
-    "instance_pool_id": "[TEST_INSTANCE_POOL_ID]"
-}
-✨ Successfully initialized template
-
 >>> cat databricks.yml
 bundle:
   name: wheel-task
 
 workspace:
   root_path: "~/.bundle/[UNIQUE_NAME]"
 
-
+include:
+  - empty.yml
 
 resources:
   jobs:
@@ -27,10 +17,10 @@ resources:
         - task_key: TestTask
           new_cluster:
             num_workers: 1
-            spark_version: "13.3.x-snapshot-scala2.12"
-            node_type_id: "[NODE_TYPE_ID]"
+            spark_version: 13.3.x-snapshot-scala2.12
+            node_type_id: [NODE_TYPE_ID]
             data_security_mode: USER_ISOLATION
-            instance_pool_id: "[TEST_INSTANCE_POOL_ID]"
+            instance_pool_id: [TEST_INSTANCE_POOL_ID]
           python_wheel_task:
             package_name: my_test_code
             entry_point: run

acceptance/bundle/integration_whl/base/empty.yml

@@ -0,0 +1,2 @@
+experimental:
+  python_wheel_wrapper: true

…e/template/{{.project_name}}/__init__.py …ration_whl/base/my_test_code/__init__.pyacceptance/bundle/integration_whl/base/template/{{.project_name}}/__init__.py renamed to acceptance/bundle/integration_whl/base/my_test_code/__init__.py acceptance/bundle/integration_whl/base/template/{{.project_name}}/__init__.py renamed to acceptance/bundle/integration_whl/base/my_test_code/__init__.py

@@ -1,8 +1,5 @@
-export SPARK_VERSION=$DEFAULT_SPARK_VERSION
-export PYTHON_WHEEL_WRAPPER=false
-envsubst < input.json.tmpl > input.json
-trace cat input.json
-$CLI bundle init . --config-file input.json
+export EXTRA_CONFIG=empty.yml
+envsubst < databricks.yml.tmpl > databricks.yml
 trace cat databricks.yml
 trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT
 trace $CLI bundle deploy

…e/template/{{.project_name}}/__main__.py …ration_whl/base/my_test_code/__main__.pyacceptance/bundle/integration_whl/base/template/{{.project_name}}/__main__.py renamed to acceptance/bundle/integration_whl/base/my_test_code/__main__.py acceptance/bundle/integration_whl/base/template/{{.project_name}}/__main__.py renamed to acceptance/bundle/integration_whl/base/my_test_code/__main__.py

@@ -0,0 +1,15 @@
+from setuptools import setup, find_packages
+
+import my_test_code
+
+setup(
+    name="my_test_code",
+    version=my_test_code.__version__,
+    author=my_test_code.__author__,
+    url="https://databricks.com",
+    author_email="john.doe@databricks.com",
+    description="my example wheel",
+    packages=find_packages(include=["my_test_code"]),
+    entry_points={"group1": "run=my_test_code.__main__:main"},
+    install_requires=["setuptools"],
+)