Merge pull request #36 from mittwald/fix/instance_url

update goharbor-client and BuildClient() func
mittwald · Aug 11, 2020 · 3a69836 · 3a69836
2 parents 13c748e + 3453612
commit 3a69836
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/json-iterator/go v1.1.8 // indirect
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mittwald/go-helm-client v0.2.0
-	github.com/mittwald/goharbor-client v1.0.1
+	github.com/mittwald/goharbor-client v1.0.3
 	github.com/operator-framework/operator-sdk v0.16.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.4.0

diff --git a/go.sum b/go.sum
@@ -660,6 +660,8 @@ github.com/mittwald/go-helm-client v0.2.0 h1:SncUYLC+g2aTho6IPPMT0ICSXsi1sSUC4rz
 github.com/mittwald/go-helm-client v0.2.0/go.mod h1:I7ckTZWf4GSsaz399Hku6iG6wA9TdTvQM40T8TnlN28=
 github.com/mittwald/goharbor-client v1.0.1 h1:kVfppDh/R7PrfFRyR4A/BoGE8uaY7zmMKNKjUxmG154=
 github.com/mittwald/goharbor-client v1.0.1/go.mod h1:vsyXzu5KJYUCzey+G75KtRdDGVjSbCXu/9tTKC85BJQ=
+github.com/mittwald/goharbor-client v1.0.3 h1:Rcpv8skea7/LngU9crogpFYlhqdIn+Zj10rNDje2o84=
+github.com/mittwald/goharbor-client v1.0.3/go.mod h1:vsyXzu5KJYUCzey+G75KtRdDGVjSbCXu/9tTKC85BJQ=
 github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
 github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

diff --git a/pkg/controller/internal/api_client.go b/pkg/controller/internal/api_client.go
@@ -30,5 +30,5 @@ func BuildClient(ctx context.Context, client client.Client,
 		return nil, err
 	}
 
-	return h.NewRESTClientForHost(harbor.Spec.InstanceURL, "/api", "admin", corePassword), nil
+	return h.NewRESTClientForHost(harbor.Spec.InstanceURL+"/api", "admin", corePassword)
 }