diff --git a/go-ssh-keysign/internal/config/model.go b/go-ssh-keysign/internal/config/model.go index 44337eb..de650da 100644 --- a/go-ssh-keysign/internal/config/model.go +++ b/go-ssh-keysign/internal/config/model.go @@ -8,7 +8,7 @@ import ( "strings" "binarycodes/ssh-keysign/internal/apperror" - "binarycodes/ssh-keysign/internal/service/utilities" + "binarycodes/ssh-keysign/internal/service/paths" ) type OAuth struct { @@ -157,7 +157,7 @@ func ValidateKeyFile(keyfilePath string, opt bool) error { return nil } - expandedKeyFilePath, err := utilities.NormalizePath(keyfilePath) + expandedKeyFilePath, err := paths.NormalizePath(keyfilePath) if err != nil { return apperror.ErrFileSystem(err) } diff --git a/go-ssh-keysign/internal/service/cacert/cacerthandler.go b/go-ssh-keysign/internal/service/cacert/cacerthandler.go index 42fef0c..7ac910d 100644 --- a/go-ssh-keysign/internal/service/cacert/cacerthandler.go +++ b/go-ssh-keysign/internal/service/cacert/cacerthandler.go @@ -110,7 +110,7 @@ func (CACertHandler) StoreUserCertAgent(ctx context.Context, u *service.UserCert now := uint64(time.Now().Unix()) if cert.ValidBefore != ssh.CertTimeInfinity && cert.ValidBefore > now { certDuration := uint64(time.Duration(cert.ValidBefore-now) * time.Second) - lifetime = min(lifetime, certDuration) + lifetime = certDuration } add := agent.AddedKey{ diff --git a/go-ssh-keysign/internal/service/keys/keyshandler.go b/go-ssh-keysign/internal/service/keys/keyshandler.go index 20d0e37..277011b 100644 --- a/go-ssh-keysign/internal/service/keys/keyshandler.go +++ b/go-ssh-keysign/internal/service/keys/keyshandler.go @@ -11,13 +11,13 @@ import ( "golang.org/x/crypto/ssh" "binarycodes/ssh-keysign/internal/service" - "binarycodes/ssh-keysign/internal/service/utilities" + "binarycodes/ssh-keysign/internal/service/paths" ) type CAKeyHandler struct{} func (c CAKeyHandler) ReadPublicKey(ctx context.Context, path string) (keyType, pubKey string, err error) { - p, err := utilities.NormalizePath(path) + p, err := paths.NormalizePath(path) if err != nil { return "", "", err } diff --git a/go-ssh-keysign/internal/service/utilities/util.go b/go-ssh-keysign/internal/service/paths/util.go similarity index 98% rename from go-ssh-keysign/internal/service/utilities/util.go rename to go-ssh-keysign/internal/service/paths/util.go index 7392985..21fb056 100644 --- a/go-ssh-keysign/internal/service/utilities/util.go +++ b/go-ssh-keysign/internal/service/paths/util.go @@ -1,4 +1,4 @@ -package utilities +package paths import ( "fmt" diff --git a/go-ssh-keysign/internal/service/types.go b/go-ssh-keysign/internal/service/types.go index a0764f5..0a3a02c 100644 --- a/go-ssh-keysign/internal/service/types.go +++ b/go-ssh-keysign/internal/service/types.go @@ -7,7 +7,7 @@ import ( "binarycodes/ssh-keysign/internal/config" "binarycodes/ssh-keysign/internal/ctxkeys" "binarycodes/ssh-keysign/internal/logging" - "binarycodes/ssh-keysign/internal/service/utilities" + "binarycodes/ssh-keysign/internal/service/paths" ) type KeyHandler interface { @@ -128,7 +128,7 @@ func (k Keys) FetchPublicKey() string { func (k Keys) FetchCertFileName() (string, error) { if k.Filename != "" { - return utilities.GetCertificateFilePath(k.Filename) + return paths.GetCertificateFilePath(k.Filename) } return "", nil diff --git a/nfpm.yaml b/nfpm.yaml index 3afa1af..5cf2af1 100644 --- a/nfpm.yaml +++ b/nfpm.yaml @@ -1,7 +1,7 @@ name: ssh-keysign arch: amd64 platform: linux -version: 0.0.8 +version: 0.0.9 section: default priority: extra maintainer: Sujoy Das diff --git a/retry-tag-workflow.sh b/retry-tag-workflow.sh index 811e36b..7dcfc79 100755 --- a/retry-tag-workflow.sh +++ b/retry-tag-workflow.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -tagname="v0.0.8" +tagname="v0.0.9" git tag -d "$tagname" git push --delete origin "$tagname" diff --git a/server/pom.xml b/server/pom.xml index b2d69d3..c50b0ea 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -7,7 +7,7 @@ io.binarycodes.homelab ssh-signer-mono SSH KeySigner - 0.0.8 + 0.0.9 pom diff --git a/server/ssh-key-signer-server/pom.xml b/server/ssh-key-signer-server/pom.xml index 483103f..91271c0 100644 --- a/server/ssh-key-signer-server/pom.xml +++ b/server/ssh-key-signer-server/pom.xml @@ -5,7 +5,7 @@ io.binarycodes.homelab ssh-key-signer-server - 0.0.8 + 0.0.9 jar Server - SSH Key Signer @@ -14,7 +14,7 @@ 21 24.9.2 - 0.0.8 + 0.0.9 diff --git a/server/ssh-signer-common-lib/pom.xml b/server/ssh-signer-common-lib/pom.xml index 7cefc6f..06c01d4 100644 --- a/server/ssh-signer-common-lib/pom.xml +++ b/server/ssh-signer-common-lib/pom.xml @@ -6,7 +6,7 @@ io.binarycodes.homelab ssh-signer-common-lib - 0.0.8 + 0.0.9 Common Library - SSH Key Signer diff --git a/update_app_version.sh b/update_app_version.sh index a6b23ed..20603ef 100755 --- a/update_app_version.sh +++ b/update_app_version.sh @@ -28,6 +28,9 @@ popd sed -i "s/tagname=\"v[0-9]\+\.[0-9]\+\.[0-9]\+\"/tagname=\"v$version\"/g" retry-tag-workflow.sh git add retry-tag-workflow.sh +sed -i "s/version: [0-9]\+\.[0-9]\+\.[0-9]\+/version: $version/g" nfpm.yaml +git add nfpm.yaml + git commit -S -m "update version to $version" git push --set-upstream origin ${branch_name}