Merge pull request #214 from buildtool/gitlab-token-variable

fix: change variable for Gitlab token
buildtool · Apr 21, 2022 · 63effce · 63effce
2 parents b6cd3fd + b7e4fad
commit 63effce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/config/registry_test.go b/pkg/config/registry_test.go
@@ -76,7 +76,7 @@ func TestEcr_Identify_MissingDockerRegistry(t *testing.T) {
 func TestGitlab_Identify(t *testing.T) {
 	defer pkg.SetEnv("CI_REGISTRY", "registry.gitlab.com")()
 	defer pkg.SetEnv("CI_REGISTRY_IMAGE", "registry.gitlab.com/group/image")()
-	defer pkg.SetEnv("CI_BUILD_TOKEN", "token")()
+	defer pkg.SetEnv("CI_JOB_TOKEN", "token")()
 
 	out := &bytes.Buffer{}
 	cfg, err := Load(name)
@@ -90,7 +90,7 @@ func TestGitlab_Identify(t *testing.T) {
 func TestGitlab_Name(t *testing.T) {
 	defer pkg.SetEnv("CI_REGISTRY", "registry.gitlab.com")()
 	defer pkg.SetEnv("CI_REGISTRY_IMAGE", "registry.gitlab.com/group/image")()
-	defer pkg.SetEnv("CI_BUILD_TOKEN", "token")()
+	defer pkg.SetEnv("CI_JOB_TOKEN", "token")()
 
 	cfg, err := Load(name)
 	assert.NoError(t, err)
@@ -101,7 +101,7 @@ func TestGitlab_Name(t *testing.T) {
 func TestGitlab_RepositoryWithoutSlash(t *testing.T) {
 	defer pkg.SetEnv("CI_REGISTRY", "registry.gitlab.com")()
 	defer pkg.SetEnv("CI_REGISTRY_IMAGE", "registry.gitlab.com")()
-	defer pkg.SetEnv("CI_BUILD_TOKEN", "token")()
+	defer pkg.SetEnv("CI_JOB_TOKEN", "token")()
 
 	out := &bytes.Buffer{}
 	cfg, err := Load(name)
@@ -115,7 +115,7 @@ func TestGitlab_RepositoryWithoutSlash(t *testing.T) {
 func TestGitlab_RegistryFallback(t *testing.T) {
 	defer pkg.SetEnv("CI_REGISTRY", "registry.gitlab.com")()
 	defer pkg.SetEnv("CI_REGISTRY_IMAGE", "")()
-	defer pkg.SetEnv("CI_BUILD_TOKEN", "token")()
+	defer pkg.SetEnv("CI_JOB_TOKEN", "token")()
 
 	dir, _ := ioutil.TempDir("", "build-tools")
 	defer os.RemoveAll(dir)

diff --git a/pkg/registry/gitlab.go b/pkg/registry/gitlab.go
@@ -16,7 +16,7 @@ type Gitlab struct {
 	dockerRegistry `yaml:"-"`
 	Registry       string `yaml:"registry" env:"CI_REGISTRY"`
 	Repository     string `yaml:"repository" env:"CI_REGISTRY_IMAGE"`
-	Token          string `yaml:"token,omitempty" env:"CI_BUILD_TOKEN"`
+	Token          string `yaml:"token,omitempty" env:"CI_JOB_TOKEN"`
 }
 
 var _ Registry = &Gitlab{}