Skip to content

Commit 1bcbb46

Browse files
committed
add sops-yubikey support
1 parent 83b68a0 commit 1bcbb46

File tree

5 files changed

+89
-28
lines changed

5 files changed

+89
-28
lines changed

default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ pkgs ? import <nixpkgs> {}
2-
, vendorHash ? "sha256-BVNK9IAvVSWgbLzkGQOuNNQLXV5SCQZuaxcIPqVvghM="
2+
, vendorHash ? "sha256-IwPBU8fwKPFI32ZlddVytb2IQ2Ll888qhsD7TynX/wI="
33
}: let
44
sops-install-secrets = pkgs.callPackage ./pkgs/sops-install-secrets {
55
inherit vendorHash;
@@ -23,6 +23,9 @@ in rec {
2323
inherit vendorHash;
2424
};
2525
unit-tests = pkgs.callPackage ./pkgs/unit-tests.nix {};
26+
27+
sops-yubikey = pkgs.callPackage ./pkgs/sops-yubikey {};
28+
2629
} // (pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
2730
lint = pkgs.callPackage ./pkgs/lint.nix {
2831
inherit sops-install-secrets;

go.mod

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/Mic92/ssh-to-age v0.0.0-20240115094500-460a2109aaf0
7-
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c
7+
github.com/ProtonMail/go-crypto v1.1.0-alpha.0-proton
88
github.com/getsops/sops/v3 v3.8.1
99
github.com/joho/godotenv v1.5.1
1010
github.com/mozilla-services/yaml v0.0.0-20201007153854-c369669a6625
@@ -13,11 +13,13 @@ require (
1313
)
1414

1515
require (
16+
cloud.google.com/go v0.112.0 // indirect
1617
cloud.google.com/go/compute v1.24.0 // indirect
1718
cloud.google.com/go/compute/metadata v0.2.3 // indirect
1819
cloud.google.com/go/iam v1.1.6 // indirect
1920
cloud.google.com/go/kms v1.15.7 // indirect
20-
filippo.io/age v1.1.1 // indirect
21+
cloud.google.com/go/storage v1.38.0 // indirect
22+
filippo.io/age v1.1.2-0.20240110114017-29b68c20fc24 // indirect
2123
filippo.io/edwards25519 v1.1.0 // indirect
2224
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
2325
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
@@ -27,15 +29,21 @@ require (
2729
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2830
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
2931
github.com/aws/aws-sdk-go-v2 v1.25.2 // indirect
32+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.0 // indirect
3033
github.com/aws/aws-sdk-go-v2/config v1.27.4 // indirect
3134
github.com/aws/aws-sdk-go-v2/credentials v1.17.4 // indirect
3235
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.2 // indirect
36+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.0 // indirect
3337
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.2 // indirect
3438
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.2 // indirect
3539
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
40+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.0 // indirect
3641
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
42+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.0 // indirect
3743
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.2 // indirect
44+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.0 // indirect
3845
github.com/aws/aws-sdk-go-v2/service/kms v1.29.1 // indirect
46+
github.com/aws/aws-sdk-go-v2/service/s3 v1.49.0 // indirect
3947
github.com/aws/aws-sdk-go-v2/service/sso v1.20.1 // indirect
4048
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.1 // indirect
4149
github.com/aws/aws-sdk-go-v2/service/sts v1.28.1 // indirect
@@ -53,6 +61,7 @@ require (
5361
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
5462
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5563
github.com/golang/protobuf v1.5.3 // indirect
64+
github.com/google/go-cmp v0.6.0 // indirect
5665
github.com/google/s2a-go v0.1.7 // indirect
5766
github.com/google/uuid v1.6.0 // indirect
5867
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
@@ -68,7 +77,7 @@ require (
6877
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
6978
github.com/hashicorp/hcl v1.0.0 // indirect
7079
github.com/hashicorp/vault/api v1.12.0 // indirect
71-
github.com/kr/pretty v0.1.0 // indirect
80+
github.com/jmespath/go-jmespath v0.4.0 // indirect
7281
github.com/kylelemons/godebug v1.1.0 // indirect
7382
github.com/lib/pq v1.10.9 // indirect
7483
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -104,3 +113,5 @@ require (
104113
gopkg.in/ini.v1 v1.67.0 // indirect
105114
gopkg.in/yaml.v3 v3.0.1 // indirect
106115
)
116+
117+
replace github.com/getsops/sops/v3 => github.com/Mic92/sops/v3 v3.7.2-0.20240318151713-a077fbf103ed

0 commit comments

Comments
 (0)