squashing

Signed-off-by: Grant Linville <[email protected]>
gptscript-ai · May 30, 2024 · e0f530d · e0f530d
1 parent 2af8cd4
commit e0f530d
Show file tree

Hide file tree

Showing 28 changed files with 31 additions and 138 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,10 @@
 PACKAGE ?= github.com/gptscript-ai/gptscript-credential-helpers
 VERSION ?= $(shell ./hack/git-meta version)
 REVISION ?= $(shell ./hack/git-meta revision)
+COMMIT_DATE ?= $(shell .hack/git-meta commit-date)
 
 GO_PKG = github.com/gptscript-ai/gptscript-credential-helpers
-GO_LDFLAGS = -s -w -X ${GO_PKG}/credentials.Version=${VERSION} -X ${GO_PKG}/credentials.Revision=${REVISION} -X ${GO_PKG}/credentials.Package=${PACKAGE}
+GO_LDFLAGS = -s -w -X ${GO_PKG}/credentials.Version=${VERSION} -X ${GO_PKG}/credentials.Revision=${REVISION} -X ${GO_PKG}/credentials.Package=${PACKAGE} -X main.version=${VERSION} -X main.commit=${REVISION} -X main.date=${COMMIT_DATE}
 
 BUILDX_CMD ?= docker buildx
 DESTDIR ?= ./bin/build

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This is a fork of https://github.com/docker/docker-credential-helpers for use wi
 1 - Download the source.
 
 ```shell
-$ git clone https://github.com/gptscript/gptscript-credential-helpers.git
+$ git clone https://github.com/gptscript-ai/gptscript-credential-helpers.git
 $ cd gptscript-credential-helpers
 ```
 

diff --git a/client/client.go b/client/client.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 // isValidCredsMessage checks if 'msg' contains invalid credentials error message.

diff --git a/client/client_test.go b/client/client_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 const (

diff --git a/credentials/version.go b/credentials/version.go
@@ -5,7 +5,7 @@ var (
 	Name = ""
 
 	// Package is filled at linking time
-	Package = "github.com/docker/docker-credential-helpers"
+	Package = "github.com/gptscript-ai/gptscript-credential-helpers"
 
 	// Version holds the complete version number. Filled in at linking time.
 	Version = "v0.0.0+unknown"

diff --git a/deb/Dockerfile b/deb/Dockerfile
diff --git a/deb/build-deb b/deb/build-deb
diff --git a/deb/debian/compat b/deb/debian/compat
diff --git a/deb/debian/control b/deb/debian/control
diff --git a/deb/debian/docker-credential-pass.install b/deb/debian/docker-credential-pass.install
diff --git a/deb/debian/docker-credential-secretservice.install b/deb/debian/docker-credential-secretservice.install
diff --git a/deb/debian/rules b/deb/debian/rules
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -57,13 +57,7 @@ target "binaries" {
     "darwin/amd64",
     "darwin/arm64",
     "linux/amd64",
-    "linux/arm64",
-    "linux/arm/v7",
-    "linux/arm/v6",
-    "linux/ppc64le",
-    "linux/s390x",
-    "windows/amd64",
-    "windows/arm64"
+    "linux/arm64"
   ]
 }
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/docker/docker-credential-helpers
+module github.com/gptscript-ai/gptscript-credential-helpers
 
 go 1.19
 

diff --git a/hack/git-meta b/hack/git-meta
@@ -9,6 +9,9 @@ case $1 in
 	"revision")
 		echo "$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)"
 		;;
+	"commit-date")
+		git show -s --format=%cI HEAD
+		;;
 	*)
 		echo "usage: ./hack/git-meta <version|revision>"
 		exit 1

diff --git a/hack/release b/hack/release
@@ -54,8 +54,8 @@ find ./${DESTDIR} -type d -empty -delete
 # universal binary
 (
   cd ${DESTDIR}
-  wget https://github.com/g-linville/makefat/releases/download/v0.1.0/makefat_0.1.0_linux_amd64.tar.gz
-  tar -xzf makefat_0.1.0_linux_amd64.tar.gz
+  wget https://github.com/g-linville/makefat/releases/download/v0.1.2/makefat_0.1.2_linux_amd64.tar.gz
+  tar -xzf makefat_0.1.2_linux_amd64.tar.gz
   find . -name "gptscript-credential-osxkeychain-*" -print0 | xargs ./makefat gptscript-credential-osxkeychain
   rm -f makefat* gptscript-credential-osxkeychain-*
 )

diff --git a/osxkeychain/cmd/main.go b/osxkeychain/cmd/main.go
@@ -3,8 +3,8 @@
 package main
 
 import (
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker-credential-helpers/osxkeychain"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/osxkeychain"
 )
 
 func main() {

diff --git a/osxkeychain/osxkeychain.go b/osxkeychain/osxkeychain.go
@@ -16,8 +16,8 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker-credential-helpers/registryurl"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/registryurl"
 )
 
 // errCredentialsNotFound is the specific error message returned by OS X

diff --git a/osxkeychain/osxkeychain_test.go b/osxkeychain/osxkeychain_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 func TestOSXKeychainHelper(t *testing.T) {

diff --git a/pass/cmd/main.go b/pass/cmd/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker-credential-helpers/pass"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/pass"
 )
 
 func main() {

diff --git a/pass/pass.go b/pass/pass.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 // PASS_FOLDER contains the directory where credentials are stored

diff --git a/pass/pass_test.go b/pass/pass_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 func TestPassHelper(t *testing.T) {

diff --git a/secretservice/cmd/main.go b/secretservice/cmd/main.go
@@ -3,8 +3,8 @@
 package main
 
 import (
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker-credential-helpers/secretservice"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/secretservice"
 )
 
 func main() {

diff --git a/secretservice/secretservice.go b/secretservice/secretservice.go
@@ -14,7 +14,7 @@ import (
 	"errors"
 	"unsafe"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 // Secretservice handles secrets using Linux secret-service as a store.

diff --git a/secretservice/secretservice_test.go b/secretservice/secretservice_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 func TestSecretServiceHelper(t *testing.T) {

diff --git a/wincred/cmd/main.go b/wincred/cmd/main.go
@@ -3,8 +3,8 @@
 package main
 
 import (
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker-credential-helpers/wincred"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/wincred"
 )
 
 func main() {

diff --git a/wincred/wincred.go b/wincred/wincred.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	winc "github.com/danieljoos/wincred"
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker-credential-helpers/registryurl"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/registryurl"
 )
 
 // Wincred handles secrets using the Windows credential service.

diff --git a/wincred/wincred_test.go b/wincred/wincred_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker-credential-helpers/credentials"
+	"github.com/gptscript-ai/gptscript-credential-helpers/credentials"
 )
 
 func TestWinCredHelper(t *testing.T) {