direct: always return non-nil config internally; fixes panic in invariant/migrate test (#4438)

Fixes panic in
TestAccept/bundle/invariant/migrate/DATABRICKS_BUNDLE_ENGINE=direct/INPUT_CONFIG=synced_database_table.yml.tmpl
when run on Cloud.

Also, fix contains.py to include matching line in the error message and
update the script to match on "panic:" instead of "panic".

Author: denik

acceptance/bin/contains.py

@@ -18,7 +18,7 @@
             found.add(t)
     for t in must_not_find:
         if t in line:
-            sys.stderr.write(f"contains error: {t!r} was not expected\n")
+            sys.stderr.write(f"contains error: {t!r} was not expected: {line.strip()!r}\n")
 
 sys.stdout.flush()
 

acceptance/bundle/invariant/migrate/script

@@ -18,7 +18,7 @@ cp databricks.yml LOG.config
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve &> LOG.destroy
-    cat LOG.destroy | contains.py '!panic' '!internal error' > /dev/null
+    cat LOG.destroy | contains.py '!panic:' '!internal error' > /dev/null
 
     # Run cleanup script if present
     CLEANUP_SCRIPT="$TESTDIR/../configs/$INPUT_CONFIG-cleanup.sh"
@@ -30,14 +30,14 @@ cleanup() {
 trap cleanup EXIT
 
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy &> LOG.deploy
-cat LOG.deploy | contains.py '!panic' '!internal error' > /dev/null
+cat LOG.deploy | contains.py '!panic:' '!internal error' > /dev/null
 
 echo INPUT_CONFIG_OK
 
 trace $CLI bundle deployment migrate &> LOG.migrate
 
-cat LOG.migrate | contains.py '!panic' '!internal error' > /dev/null
+cat LOG.migrate | contains.py '!panic:' '!internal error' > /dev/null
 
 $CLI bundle plan -o json &> plan.json
-cat plan.json | contains.py '!panic' '!internal error' > /dev/null
+cat plan.json | contains.py '!panic:' '!internal error' > /dev/null
 verify_no_drift.py plan.json

acceptance/selftest/contains/output.txt

@@ -20,7 +20,7 @@ Failed script
 === This should complain about Hello present in output
 >>> python3 ./success.py
 Hello world
-contains error: 'Hello' was not expected
+contains error: 'Hello' was not expected: 'Hello world'
 
 === This should not complain
 >>> python3 ./success.py

bundle/direct/dresources/config.go

@@ -39,6 +39,12 @@ var (
 	globalConfig        *Config
 	generatedConfigOnce sync.Once
 	generatedConfig     *Config
+	empty               = ResourceLifecycleConfig{
+		IgnoreRemoteChanges: nil,
+		IgnoreLocalChanges:  nil,
+		RecreateOnChanges:   nil,
+		UpdateIDOnChanges:   nil,
+	}
 )
 
 // MustLoadConfig loads and parses the embedded resources.yml configuration.
@@ -78,7 +84,7 @@ func GetResourceConfig(resourceType string) *ResourceLifecycleConfig {
 	if rc, ok := cfg.Resources[resourceType]; ok {
 		return &rc
 	}
-	return nil
+	return &empty
 }
 
 // GetGeneratedResourceConfig returns the generated lifecycle config for a given resource type.
@@ -88,5 +94,5 @@ func GetGeneratedResourceConfig(resourceType string) *ResourceLifecycleConfig {
 	if rc, ok := cfg.Resources[resourceType]; ok {
 		return &rc
 	}
-	return nil
+	return &empty
 }

bundle/direct/dresources/config_test.go

@@ -12,6 +12,6 @@ func TestMustLoadConfig(t *testing.T) {
 }
 
 func TestGetResourceConfig(t *testing.T) {
-	assert.NotNil(t, GetResourceConfig("volumes"))
-	assert.Nil(t, GetResourceConfig("nonexistent"))
+	assert.NotEmpty(t, GetResourceConfig("volumes").RecreateOnChanges)
+	assert.Empty(t, GetResourceConfig("nonexistent").RecreateOnChanges)
 }