Skip to content

Commit 4c025f5

Browse files
author
Zsolt
committed
feat: update to go version 1.0.3; replace belitre with ustream GH org
1 parent 7330abb commit 4c025f5

File tree

9 files changed

+33
-19
lines changed

9 files changed

+33
-19
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dist:
5252
.PHONY: build-cross
5353
build-cross: LDFLAGS += -extldflags "-static"
5454
build-cross:
55-
CGO_ENABLED=0 gox -parallel=2 -output="_dist/{{.OS}}-{{.Arch}}/$(PLUGIN_FULL_NAME)/bin/${BIN_NAME}" -osarch='$(TARGETS)' -ldflags '$(LDFLAGS)' github.com/belitre/helm-push-artifactory-plugin/cmd/push
55+
CGO_ENABLED=0 gox -parallel=2 -output="_dist/{{.OS}}-{{.Arch}}/$(PLUGIN_FULL_NAME)/bin/${BIN_NAME}" -osarch='$(TARGETS)' -ldflags '$(LDFLAGS)' github.com/ustream/helm-push-artifactory-plugin/cmd/push
5656

5757
.PHONY: clean
5858
clean:

‎cmd/push/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"strconv"
1313
"strings"
1414

15-
"github.com/belitre/helm-push-artifactory-plugin/pkg/artifactory"
16-
"github.com/belitre/helm-push-artifactory-plugin/pkg/helm"
17-
helmrepo "github.com/belitre/helm-push-artifactory-plugin/pkg/repo"
18-
"github.com/belitre/helm-push-artifactory-plugin/pkg/version"
1915
"github.com/spf13/cobra"
16+
"github.com/ustream/helm-push-artifactory-plugin/pkg/artifactory"
17+
"github.com/ustream/helm-push-artifactory-plugin/pkg/helm"
18+
helmrepo "github.com/ustream/helm-push-artifactory-plugin/pkg/repo"
19+
"github.com/ustream/helm-push-artifactory-plugin/pkg/version"
2020
)
2121

2222
type (

‎go.mod‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
module github.com/belitre/helm-push-artifactory-plugin
1+
module github.com/ustream/helm-push-artifactory-plugin
22

3-
go 1.14
3+
go 1.15
44

55
require (
6+
github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce // indirect
7+
github.com/hashicorp/go-version v1.6.0 // indirect
68
github.com/jfrog/jfrog-client-go v0.8.1
9+
github.com/mitchellh/gox v1.0.1 // indirect
710
github.com/pkg/errors v0.9.1
811
github.com/spf13/cobra v0.0.6
912
github.com/stretchr/testify v1.5.1

‎go.sum‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
33
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
44
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
55
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
6+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
67
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
78
github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
89
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
@@ -253,6 +254,9 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
253254
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
254255
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
255256
github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
257+
github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
258+
github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
259+
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
256260
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
257261
github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
258262
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -262,6 +266,7 @@ github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63
262266
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
263267
github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
264268
github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
269+
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
265270
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
266271
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
267272
github.com/jfrog/gofrog v1.0.5/go.mod h1:4Caxvc8B2K1A798G1Ne+SsUICRPPre4GpgcFqj+EXJ8=
@@ -284,6 +289,7 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
284289
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
285290
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
286291
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
292+
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
287293
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
288294
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
289295
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -314,6 +320,10 @@ github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
314320
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
315321
github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
316322
github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
323+
github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI=
324+
github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4=
325+
github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=
326+
github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
317327
github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
318328
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
319329
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
@@ -394,6 +404,7 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
394404
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
395405
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
396406
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
407+
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
397408
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
398409
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
399410
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=

‎pkg/artifactory/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"net/http"
66

7-
"github.com/belitre/helm-push-artifactory-plugin/pkg/tlsutil"
7+
"github.com/ustream/helm-push-artifactory-plugin/pkg/tlsutil"
88
)
99

1010
type (
@@ -52,7 +52,7 @@ func NewClient(opts ...Option) (Client, error) {
5252
return &c, nil
5353
}
5454

55-
//Create transport with TLS config
55+
// Create transport with TLS config
5656
func newTransport(certFile, keyFile, caFile string, insecureSkipVerify bool) (*http.Transport, error) {
5757
transport := &http.Transport{}
5858

‎pkg/artifactory/option.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,28 +73,28 @@ func Timeout(timeout int64) Option {
7373
}
7474
}
7575

76-
//CAFile specifies the path of CA bundle
76+
// CAFile specifies the path of CA bundle
7777
func CAFile(caFile string) Option {
7878
return func(opts *options) {
7979
opts.caFile = caFile
8080
}
8181
}
8282

83-
//CertFile specifies the path of SSL certificate file
83+
// CertFile specifies the path of SSL certificate file
8484
func CertFile(certFile string) Option {
8585
return func(opts *options) {
8686
opts.certFile = certFile
8787
}
8888
}
8989

90-
//KeyFile specifies the path of SSL key file
90+
// KeyFile specifies the path of SSL key file
9191
func KeyFile(keyFile string) Option {
9292
return func(opts *options) {
9393
opts.keyFile = keyFile
9494
}
9595
}
9696

97-
//InsecureSkipVerify to indicate if verify the certificate when connecting
97+
// InsecureSkipVerify to indicate if verify the certificate when connecting
9898
func InsecureSkipVerify(insecureSkipVerify bool) Option {
9999
return func(opts *options) {
100100
opts.insecureSkipVerify = insecureSkipVerify

‎plugin.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "push-artifactory"
2-
version: "1.0.2"
3-
usage: "Please see https://github.com/belitre/helm-push-artifactory-plugin for usage"
2+
version: "1.0.3"
3+
usage: "Please see https://github.com/ustream/helm-push-artifactory-plugin for usage"
44
description: "Push helm charts to artifactory"
55
ignoreFlags: false
66
useTunnel: false

‎scripts/install_plugin.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ helm_version="$(helm version | grep "Version" | cut -d '"' -f 2 | cut -d '.' -f
1313

1414
if [ "$helm_version" != "$supported_helm_version" ]; then
1515
echo "Error, this version of helm-push-artifactory-plugin is only for Helm $supported_helm_version"
16-
echo "Please check https://github.com/belitre/helm-push-artifactory-plugin to find the correct version"
16+
echo "Please check https://github.com/ustream/helm-push-artifactory-plugin to find the correct version"
1717
exit 1
1818
fi
1919

@@ -36,7 +36,7 @@ fi
3636

3737
filename="helm-push-artifactory-v${version}-${osname}.tar.gz"
3838

39-
url="https://github.com/belitre/helm-push-artifactory-plugin/releases/download/v${version}/${filename}"
39+
url="https://github.com/ustream/helm-push-artifactory-plugin/releases/download/v${version}/${filename}"
4040

4141
echo $url
4242

‎versioning.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ BINARY_VERSION ?= ${GIT_TAG}
1111

1212
# Only set Version if building a tag or VERSION is set
1313
ifneq ($(BINARY_VERSION),)
14-
LDFLAGS += -X github.com/belitre/helm-push-artifactory-plugin/pkg/version.Version=${BINARY_VERSION}
14+
LDFLAGS += -X github.com/ustream/helm-push-artifactory-plugin/pkg/version.Version=${BINARY_VERSION}
1515
endif
1616

17-
LDFLAGS += -X github.com/belitre/helm-push-artifactory-plugin/pkg/version.GitCommit=${GIT_COMMIT}
17+
LDFLAGS += -X github.com/ustream/helm-push-artifactory-plugin/pkg/version.GitCommit=${GIT_COMMIT}
1818

1919
info:
2020
@echo "Version: ${VERSION}"

0 commit comments

Comments
 (0)