backport: bug fixes for 0.21 (#793)

* fix: auth check (#773) * fix: auth check Signed-off-by: Matej Vasek <mvasek@redhat.com> * fix: auth check Signed-off-by: Matej Vasek <mvasek@redhat.com> * chore: skip integration tests for now (#780) Signed-off-by: Lance Ball <lball@redhat.com> * fix: error type-check condition (#786) Signed-off-by: Matej Vasek <mvasek@redhat.com> * fix: use domain qualified registry for springboot (#789) The builder image name should include the registry name. Also it seems that the tiny builder doesn't actually work. We need base. Fixes: #775 Signed-off-by: Lance Ball <lball@redhat.com> * fix: use paketo base image for springboot (#792) The build actually seems to require `base` vs `tiny. Signed-off-by: Lance Ball <lball@redhat.com> Co-authored-by: Matej Vasek <mvasek@redhat.com>
knative · Jan 27, 2022 · 947f982 · 947f982
1 parent a579391
commit 947f982
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/docker/creds/credentials.go b/docker/creds/credentials.go
@@ -41,7 +41,7 @@ func CheckAuth(ctx context.Context, registry string, credentials docker.Credenti
 		serverAddress = "https://" + serverAddress
 	}
 
-	url := fmt.Sprintf("%s/v2", serverAddress)
+	url := fmt.Sprintf("%s/v2/", serverAddress)
 
 	authenticator := &authn.Basic{
 		Username: credentials.Username,
@@ -55,6 +55,10 @@ func CheckAuth(ctx context.Context, registry string, credentials docker.Credenti
 
 	tr, err := transport.NewWithContext(ctx, reg, authenticator, trans, nil)
 	if err != nil {
+		var transportErr *transport.Error
+		if errors.As(err, &transportErr) && transportErr.StatusCode == 401 {
+			return ErrUnauthorized
+		}
 		return err
 	}
 

diff --git a/docker/creds/credentials_test.go b/docker/creds/credentials_test.go
@@ -168,6 +168,7 @@ func startServer(t *testing.T) (addr, addrTLS string, stopServer func()) {
 	addrTLS = listenerTLS.Addr().String()
 
 	handler := http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
+		// TODO add also test for token based auth
 		resp.Header().Add("WWW-Authenticate", "basic")
 		if user, pwd, ok := req.BasicAuth(); ok {
 			if user == "testuser" && pwd == "testpwd" {

diff --git a/pkged.go b/pkged.go
diff --git a/templates/springboot/manifest.yaml b/templates/springboot/manifest.yaml
@@ -1,5 +1,5 @@
 builders:
-  default: paketobuildpacks/builder:tiny
+  default: gcr.io/paketo-buildpacks/builder:base
 buildEnvs:
   - name: BP_NATIVE_IMAGE
     value: "true"
diff --git a/test/presubmit-tests.sh b/test/presubmit-tests.sh
@@ -48,13 +48,13 @@ function unit_tests() {
 }
 
 function integration_tests() {
-  header "Running func integration tests"
-  make test-integration || failed=1
+  header "Skipping func integration tests"
+  # make test-integration || failed=1
 
-  if (( failed )); then
-    results_banner "Integration tests failed"
-    exit ${failed}
-  fi
+  # if (( failed )); then
+  #   results_banner "Integration tests failed"
+  #   exit ${failed}
+  # fi
 }
 
 main $@