apps: update component spec interfaces (#559)

* update app component spec interfaces

* update interface AppBuildableComponentSpec to match functions components
* add interfaces AppDockerBuildableComponentSpec and AppCNBBuildableComponentSpec

* remove deprecated field/accessor GetEnvironmentSlug

Author: Kamal Nasser

apps.go

@@ -507,21 +507,30 @@ type AppBuildableComponentSpec interface {
 	GetGitLab() *GitLabSourceSpec
 
 	GetSourceDir() string
-	GetDockerfilePath() string
-	GetBuildCommand() string
-	GetEnvironmentSlug() string
 
 	GetEnvs() []*AppVariableDefinition
 }
 
+// AppDockerBuildableComponentSpec is a component that is buildable from source using Docker.
+type AppDockerBuildableComponentSpec interface {
+	AppBuildableComponentSpec
+
+	GetDockerfilePath() string
+}
+
+// AppCNBBuildableComponentSpec is a component that is buildable from source using cloud native buildpacks.
+type AppCNBBuildableComponentSpec interface {
+	AppBuildableComponentSpec
+
+	GetBuildCommand() string
+}
+
 // AppContainerComponentSpec is a component that runs in a cluster.
 type AppContainerComponentSpec interface {
 	AppBuildableComponentSpec
 
 	GetImage() *ImageSourceSpec
-
 	GetRunCommand() string
-
 	GetInstanceSizeSlug() string
 	GetInstanceCount() int64
 }

apps_accessors.go

@@ -658,38 +658,96 @@ func TestApps_Interfaces(t *testing.T) {
 	})
 
 	t.Run("AppBuildableComponentSpec", func(t *testing.T) {
-		for _, impl := range []interface{}{
-			&AppServiceSpec{},
-			&AppWorkerSpec{},
-			&AppJobSpec{},
-			&AppStaticSiteSpec{},
+		for impl, wantMatch := range map[any]bool{
+			&AppServiceSpec{}:    true,
+			&AppWorkerSpec{}:     true,
+			&AppJobSpec{}:        true,
+			&AppStaticSiteSpec{}: true,
+			&AppFunctionsSpec{}:  true,
+
+			&AppDatabaseSpec{}: false,
+		} {
+			_, ok := impl.(AppBuildableComponentSpec)
+			if wantMatch && !ok {
+				t.Fatalf("%T should match interface", impl)
+			} else if !wantMatch && ok {
+				t.Fatalf("%T should NOT match interface", impl)
+			}
+		}
+	})
+
+	t.Run("AppDockerBuildableComponentSpec", func(t *testing.T) {
+		for impl, wantMatch := range map[any]bool{
+			&AppServiceSpec{}:    true,
+			&AppWorkerSpec{}:     true,
+			&AppJobSpec{}:        true,
+			&AppStaticSiteSpec{}: true,
+
+			&AppFunctionsSpec{}: false,
+			&AppDatabaseSpec{}:  false,
+		} {
+			_, ok := impl.(AppDockerBuildableComponentSpec)
+			if wantMatch && !ok {
+				t.Fatalf("%T should match interface", impl)
+			} else if !wantMatch && ok {
+				t.Fatalf("%T should NOT match interface", impl)
+			}
+		}
+	})
+
+	t.Run("AppCNBBuildableComponentSpec", func(t *testing.T) {
+		for impl, wantMatch := range map[any]bool{
+			&AppServiceSpec{}:    true,
+			&AppWorkerSpec{}:     true,
+			&AppJobSpec{}:        true,
+			&AppStaticSiteSpec{}: true,
+
+			&AppFunctionsSpec{}: false,
+			&AppDatabaseSpec{}:  false,
 		} {
-			if _, ok := impl.(AppBuildableComponentSpec); !ok {
+			_, ok := impl.(AppCNBBuildableComponentSpec)
+			if wantMatch && !ok {
 				t.Fatalf("%T should match interface", impl)
+			} else if !wantMatch && ok {
+				t.Fatalf("%T should NOT match interface", impl)
 			}
 		}
 	})
 
 	t.Run("AppContainerComponentSpec", func(t *testing.T) {
-		for _, impl := range []interface{}{
-			&AppServiceSpec{},
-			&AppWorkerSpec{},
-			&AppJobSpec{},
+		for impl, wantMatch := range map[any]bool{
+			&AppServiceSpec{}: true,
+			&AppWorkerSpec{}:  true,
+			&AppJobSpec{}:     true,
+
+			&AppStaticSiteSpec{}: false,
+			&AppFunctionsSpec{}:  false,
+			&AppDatabaseSpec{}:   false,
 		} {
-			if _, ok := impl.(AppContainerComponentSpec); !ok {
+			_, ok := impl.(AppContainerComponentSpec)
+			if wantMatch && !ok {
 				t.Fatalf("%T should match interface", impl)
+			} else if !wantMatch && ok {
+				t.Fatalf("%T should NOT match interface", impl)
 			}
 		}
 	})
 
 	t.Run("AppRoutableComponentSpec", func(t *testing.T) {
-		for _, impl := range []interface{}{
-			&AppServiceSpec{},
-			&AppStaticSiteSpec{},
-			&AppFunctionsSpec{},
+		for impl, wantMatch := range map[any]bool{
+			&AppServiceSpec{}:    true,
+			&AppStaticSiteSpec{}: true,
+			&AppFunctionsSpec{}:  true,
+
+			&AppWorkerSpec{}:   false,
+			&AppJobSpec{}:      false,
+			&AppDatabaseSpec{}: false,
 		} {
-			if _, ok := impl.(AppRoutableComponentSpec); !ok {
+			_, ok := impl.(AppRoutableComponentSpec)
+			if wantMatch && !ok {
 				t.Fatalf("%T should match interface", impl)
+			} else if !wantMatch && ok {
+				t.Fatalf("%T should NOT match interface", impl)
 			}
 		}
 	})
@@ -717,6 +775,20 @@ func TestApps_Interfaces(t *testing.T) {
 				t.Fatalf("%T should match interface", impl)
 			}
 		}
+		for impl, wantMatch := range map[any]bool{
+			&GitSourceSpec{}:    true,
+			&GitHubSourceSpec{}: true,
+			&GitLabSourceSpec{}: true,
+
+			&ImageSourceSpec{}: false,
+		} {
+			_, ok := impl.(VCSSourceSpec)
+			if wantMatch && !ok {
+				t.Fatalf("%T should match interface", impl)
+			} else if !wantMatch && ok {
+				t.Fatalf("%T should NOT match interface", impl)
+			}
+		}
 	})
 }