Merge pull request #986 from dgageot/projectid

Extract code from GCB

Author: dgageot

pkg/skaffold/build/gcb/cloud_build.go

@@ -29,6 +29,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/gcp"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1alpha3"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
@@ -63,9 +64,14 @@ func (b *Builder) buildArtifact(ctx context.Context, out io.Writer, tagger tag.T
 	}
 	defer c.Close()
 
-	projectID, err := b.guessProjectID(artifact)
-	if err != nil {
-		return "", errors.Wrap(err, "getting projectID")
+	projectID := b.ProjectID
+	if projectID == "" {
+		guessedProjectID, err := gcp.ExtractProjectID(artifact.ImageName)
+		if err != nil {
+			return "", errors.Wrap(err, "extracting projectID from image name")
+		}
+
+		projectID = guessedProjectID
 	}
 
 	cbBucket := fmt.Sprintf("%s%s", projectID, constants.GCSBucketSuffix)

pkg/skaffold/build/gcb/project.go renamed to pkg/skaffold/gcp/projectid.go

@@ -14,24 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gcb
+package gcp
 
 import (
 	"fmt"
 	"strings"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1alpha3"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/registry"
 	"github.com/pkg/errors"
 )
 
-func (b *Builder) guessProjectID(artifact *v1alpha3.Artifact) (string, error) {
-	if b.ProjectID != "" {
-		return b.ProjectID, nil
-	}
-
-	ref, err := reference.ParseNormalizedNamed(artifact.ImageName)
+// ExtractProjectID extracts the GCP projectID from a docker image name
+// This only works if the imageName is pushed to gcr.io.
+func ExtractProjectID(imageName string) (string, error) {
+	ref, err := reference.ParseNormalizedNamed(imageName)
 	if err != nil {
 		return "", errors.Wrap(err, "parsing image name for registry")
 	}
@@ -42,15 +39,12 @@ func (b *Builder) guessProjectID(artifact *v1alpha3.Artifact) (string, error) {
 	}
 
 	index := repoInfo.Index
-	if !index.Official {
-		switch index.Name {
-		case "gcr.io", "us.gcr.io", "eu.gcr.io", "asia.gcr.io", "staging-k8s.gcr.io":
-			parts := strings.Split(repoInfo.Name.String(), "/")
-			if len(parts) >= 2 {
-				return parts[1], nil
-			}
+	if index.Name == "gcr.io" || strings.HasSuffix(index.Name, ".gcr.io") {
+		parts := strings.Split(repoInfo.Name.String(), "/")
+		if len(parts) >= 2 {
+			return parts[1], nil
 		}
 	}
 
-	return "", fmt.Errorf("unable to guess GCP projectID from image name [%s]", artifact.ImageName)
+	return "", fmt.Errorf("unable to guess GCP projectID from image name [%s]", imageName)
 }

pkg/skaffold/build/gcb/project_test.go renamed to pkg/skaffold/gcp/projectid_test.go

@@ -14,60 +14,46 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gcb
+package gcp
 
 import (
 	"testing"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1alpha3"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
-func TestGuessProjectID(t *testing.T) {
+func TestExtractProjectID(t *testing.T) {
 	var tests = []struct {
 		description string
-		config      *v1alpha3.GoogleCloudBuild
-		artifact    *v1alpha3.Artifact
+		imageName   string
 		expected    string
 		shouldErr   bool
 	}{
-		{
-			description: "fixed projectId",
-			config:      &v1alpha3.GoogleCloudBuild{ProjectID: "fixed"},
-			artifact:    &v1alpha3.Artifact{ImageName: "any"},
-			expected:    "fixed",
-		},
 		{
 			description: "gcr.io",
-			config:      &v1alpha3.GoogleCloudBuild{},
-			artifact:    &v1alpha3.Artifact{ImageName: "gcr.io/project/image"},
+			imageName:   "gcr.io/project/image",
 			expected:    "project",
 		},
 		{
 			description: "eu.gcr.io",
-			config:      &v1alpha3.GoogleCloudBuild{},
-			artifact:    &v1alpha3.Artifact{ImageName: "gcr.io/project/image"},
+			imageName:   "gcr.io/project/image",
 			expected:    "project",
 		},
 		{
 			description: "docker hub",
-			config:      &v1alpha3.GoogleCloudBuild{},
-			artifact:    &v1alpha3.Artifact{ImageName: "project/image"},
+			imageName:   "project/image",
 			shouldErr:   true,
 		},
 		{
 			description: "invalid GCR image",
-			config:      &v1alpha3.GoogleCloudBuild{},
-			artifact:    &v1alpha3.Artifact{ImageName: "gcr.io"},
+			imageName:   "gcr.io",
 			shouldErr:   true,
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			builder := NewBuilder(test.config)
-
-			projectID, err := builder.guessProjectID(test.artifact)
+			projectID, err := ExtractProjectID(test.imageName)
 
 			testutil.CheckErrorAndDeepEqual(t, test.shouldErr, err, test.expected, projectID)
 		})