this commit will go away when I rebase on depsv2 because the test dat…

…a should match then

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

tests/testdata/helpers.go

@@ -25,6 +25,12 @@ const (
 	// MyInfraRef is the full reference to the myinfra test bundle.
 	MyInfraRef = "localhost:5000/myinfra:v0.1.0"
 
+	// MySQLDb is the test bundle that is a dependency of the myinfra test bundle.
+	MySQLDb = "mysqldb"
+
+	// MySQLDbRef is the full reference to the mysqldb test bundle.
+	MySQLDbRef = "localhost:5000/mysqldb:v0.1.0"
+
 	// MyApp is the root test bundle that exercises dependencies.
 	MyApp = "myapp"
 

tests/testdata/mybuns/porter.yaml

@@ -1,5 +1,5 @@
 # This is a test bundle that makes no logical sense, but it does exercise lots of different bundle features
-
+#schemaType: Bundle
 schemaVersion: 1.0.0
 name: mybuns
 version: 0.1.2
@@ -173,17 +173,8 @@ dependencies:
     - name: db
       bundle:
         reference: "localhost:5000/mydb:v0.1.0"
-        # TODO(PEP003): Implement in https://github.com/getporter/porter/issues/2548
-        #interface:
-        #  document:
-        #    outputs:
-        #      - name: connstr
-        #        $id: "getporter.org/interfaces/mysql.connection-string"
       parameters:
         database: bigdb
-        collation: ${bundle.parameters.db-collation}
-      credentials:
-        username: ${bundle.credentials.username}
 
 images:
   whalesayd:

tests/testdata/mydb/porter.yaml

@@ -1,5 +1,5 @@
 # This is a test bundle that can be used as a dependency
-# TODO(PEP003): Do not depend on this bundle from mybuns, and move testcases like installerImage out of here
+
 schemaVersion: 1.0.0
 name: mydb
 version: 0.1.0
@@ -9,16 +9,7 @@ registry: localhost:5000
 parameters:
   - name: database
     type: string
-    default: "mydb"
-  - name: collation
-    type: string
-    default: "Latin1_General_100_CS_AS"
-  - name: logLevel
-    type: string
-
-credentials:
-  - name: token
-    env: CLOUD_TOKEN
+    default: "(default)"
 
 outputs:
   - name: connStr
@@ -50,7 +41,7 @@ install:
       description: "Debug"
       command: echo
       arguments:
-        - "image: ${ bundle.installerImage }"
+        - "image:${ bundle.installerImage }"
 
 status:
   - exec:

tests/testdata/myinfra/porter.yaml

@@ -21,7 +21,7 @@ dependencies:
   requires:
     - name: db
       bundle:
-        reference: "localhost:5000/mydb:v0.1.0"
+        reference: "localhost:5000/mysqldb:v0.1.0"
       credentials:
         token: ${bundle.credentials.token}
       parameters:

tests/testdata/mysqldb/.dockerignore

@@ -0,0 +1,4 @@
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file
+# Put files here that you don't want copied into your bundle's invocation image
+.gitignore
+Dockerfile.tmpl

tests/testdata/mysqldb/.gitignore

@@ -0,0 +1 @@
+.cnab/

tests/testdata/mysqldb/README.md

@@ -0,0 +1 @@
+This is a modified copy of the mydb bundle so that we can make changes for the dependencies v2 feature without breaking existing tests that use mybuns/mydb.

tests/testdata/mysqldb/connection-string.txt

@@ -0,0 +1 @@
+this is a connection string

tests/testdata/mysqldb/porter.yaml

@@ -0,0 +1,72 @@
+# This is a test bundle that can be used as a dependency
+# TODO(PEP003): Do not depend on this bundle from mybuns, and move testcases like installerImage out of here
+schemaVersion: 1.0.0
+name: mysqldb
+version: 0.1.0
+description: "A test bundle dependency"
+registry: localhost:5000
+
+parameters:
+  - name: database
+    type: string
+    default: "mysqldb"
+  - name: collation
+    type: string
+    default: "Latin1_General_100_CS_AS"
+  - name: logLevel
+    type: string
+    default: error
+
+credentials:
+  - name: token
+    env: CLOUD_TOKEN
+
+outputs:
+  - name: connStr
+    type: file
+    path: /cnab/app/connection-string.txt
+    applyTo:
+      - install
+      - upgrade
+
+mixins:
+  - exec
+
+dry-run:
+  - exec:
+      command: echo
+      arguments:
+        - "ready to install mysqldb"
+
+install:
+  - exec:
+      command: echo
+      arguments:
+        - "installing mysqldb"
+  - exec:
+      command: echo
+      arguments:
+        - "database: ${ bundle.parameters.database }"
+  - exec:
+      description: "Debug"
+      command: echo
+      arguments:
+        - "image: ${ bundle.installerImage }"
+
+status:
+  - exec:
+      command: echo
+      arguments:
+        - "mysqldb is looking great!"
+
+upgrade:
+  - exec:
+      command: echo
+      arguments:
+        - "upgrading mysqldb"
+
+uninstall:
+  - exec:
+      command: echo
+      arguments:
+        - "uninstalling mysqldb"