Update go.mod, go.sum and deps.bzl

Also update Kokoro test scripts to replace com_github_tink_crypto_tink_go_v2 instead of com_github_tink_crypto_tink_go.

PiperOrigin-RevId: 542478842
Change-Id: I814052eb453fe9c49e35a9be0c3d485dff8de981

Author: morambro

deps.bzl

@@ -11,8 +11,8 @@ def tink_go_awskms_dependencies():
     go_repository(
         name = "com_github_aws_aws_sdk_go",
         importpath = "github.com/aws/aws-sdk-go",
-        sum = "h1:Asrp6EMqqRxZvjK0NjzkWcrOk15RnWtupuUrUuZMabk=",
-        version = "v1.44.267",
+        sum = "h1:bLnBVutuyCGYZgQlu3wiXOJXtgI7EIWAaDIqVVudF3w=",
+        version = "v1.44.286",
     )
     go_repository(
         name = "com_github_davecgh_go_spew",
@@ -64,12 +64,14 @@ def tink_go_awskms_dependencies():
         sum = "h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=",
         version = "v0.1.0",
     )
+
     go_repository(
-        name = "com_github_tink_crypto_tink_go",
-        importpath = "github.com/tink-crypto/tink-go",
-        sum = "h1:XpILcYStxVV79Y3eFpiJLKXQ35QuSn9kVLyq5QPU8Vg=",
-        version = "v0.0.0-20230523140635-48bf5fd5b1c7",
+        name = "com_github_tink_crypto_tink_go_v2",
+        importpath = "github.com/tink-crypto/tink-go/v2",
+        sum = "h1:LutFJapahsM0i/6hKfOkzSYTVeshmFs+jloZXqe9z9s=",
+        version = "v2.0.0",
     )
+
     go_repository(
         name = "com_github_yuin_goldmark",
         importpath = "github.com/yuin/goldmark",

go.mod

@@ -3,10 +3,7 @@ module github.com/tink-crypto/tink-go-awskms/v2
 go 1.19
 
 require (
-	github.com/aws/aws-sdk-go v1.44.267
-	// NOTE: The tag doesn't exist, yet this is needed since we keep compatibility with the top of
-	// tink-go's main branch. Gomod tests add a replace directive to use a local tink-go repository.
-	// TODO(b/204159796): Update this once tink-go release is complete.
+	github.com/aws/aws-sdk-go v1.44.286
 	github.com/tink-crypto/tink-go/v2 v2.0.0
 )
 

go.sum

@@ -1,5 +1,5 @@
-github.com/aws/aws-sdk-go v1.44.267 h1:Asrp6EMqqRxZvjK0NjzkWcrOk15RnWtupuUrUuZMabk=
-github.com/aws/aws-sdk-go v1.44.267/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.286 h1:bLnBVutuyCGYZgQlu3wiXOJXtgI7EIWAaDIqVVudF3w=
+github.com/aws/aws-sdk-go v1.44.286/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -13,8 +13,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/tink-crypto/tink-go v0.0.0-20230523140635-48bf5fd5b1c7 h1:XpILcYStxVV79Y3eFpiJLKXQ35QuSn9kVLyq5QPU8Vg=
-github.com/tink-crypto/tink-go v0.0.0-20230523140635-48bf5fd5b1c7/go.mod h1:HhtDVdE/PRZFRia834tkmcwuscnaAzda1RJUW9Pr3Rg=
+github.com/tink-crypto/tink-go/v2 v2.0.0 h1:LutFJapahsM0i/6hKfOkzSYTVeshmFs+jloZXqe9z9s=
+github.com/tink-crypto/tink-go/v2 v2.0.0/go.mod h1:QAbyq9LZncomYnScxlfaHImbV4ieNIe6bnu/Xcqqox4=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

integration/awskms/BUILD.bazel

@@ -18,8 +18,8 @@ go_library(
         "@com_github_aws_aws_sdk_go//aws/session",
         "@com_github_aws_aws_sdk_go//service/kms",
         "@com_github_aws_aws_sdk_go//service/kms/kmsiface",
-        "@com_github_tink_crypto_tink_go//core/registry",
-        "@com_github_tink_crypto_tink_go//tink",
+        "@com_github_tink_crypto_tink_go_v2//core/registry",
+        "@com_github_tink_crypto_tink_go_v2//tink",
     ],
 )
 
@@ -42,10 +42,10 @@ go_test(
         "//integration/awskms/internal/fakeawskms",
         "@com_github_aws_aws_sdk_go//aws",
         "@com_github_aws_aws_sdk_go//service/kms",
-        "@com_github_tink_crypto_tink_go//aead",
-        "@com_github_tink_crypto_tink_go//core/registry",
-        "@com_github_tink_crypto_tink_go//keyset",
-        "@com_github_tink_crypto_tink_go//subtle/random",
+        "@com_github_tink_crypto_tink_go_v2//aead",
+        "@com_github_tink_crypto_tink_go_v2//core/registry",
+        "@com_github_tink_crypto_tink_go_v2//keyset",
+        "@com_github_tink_crypto_tink_go_v2//subtle/random",
     ],
 )
 

integration/awskms/internal/fakeawskms/BUILD.bazel

@@ -9,9 +9,9 @@ go_library(
     srcs = ["fakeawskms.go"],
     importpath = "github.com/tink-crypto/tink-go-awskms/v2/integration/awskms/internal/fakeawskms",
     deps = [
-        "@com_github_tink_crypto_tink_go//tink",
-        "@com_github_tink_crypto_tink_go//keyset",
-        "@com_github_tink_crypto_tink_go//aead",
+        "@com_github_tink_crypto_tink_go_v2//tink",
+        "@com_github_tink_crypto_tink_go_v2//keyset",
+        "@com_github_tink_crypto_tink_go_v2//aead",
         "@com_github_aws_aws_sdk_go//service/kms",
         "@com_github_aws_aws_sdk_go//service/kms/kmsiface",
     ],

kokoro/gcp_ubuntu/bazel/run_tests.sh

@@ -60,17 +60,17 @@ readonly GITHUB_ORG="https://github.com/tink-crypto"
 
 cp WORKSPACE WORKSPACE.bak
 
-# Replace com_github_tink_crypto_tink_go with a local one.
+# Replace com_github_tink_crypto_tink_go_v2 with a local one.
 mapfile -d '' TINK_GO_LOCAL_REPO <<'EOF'
 local_repository(\
-    name = "com_github_tink_crypto_tink_go",\
+    name = "com_github_tink_crypto_tink_go_v2",\
     path = "../tink_go",\
 )\
 EOF
 readonly TINK_GO_LOCAL_REPO
 
 mapfile -d '' TINK_GO_DEPENDENCIES <<'EOF'
-load("@com_github_tink_crypto_tink_go//:deps.bzl", tink_go_dependencies="go_dependencies")\
+load("@com_github_tink_crypto_tink_go_v2//:deps.bzl", tink_go_dependencies="go_dependencies")\
 \
 tink_go_dependencies()\
 EOF

kokoro/macos_external/bazel/run_tests.sh

@@ -41,10 +41,10 @@ echo "Using go binary from $(which go): $(go version)"
 # refactoring that takes into account extensions to tink-go.
 ./kokoro/testutils/copy_credentials.sh "testdata" "aws"
 
-# Replace com_github_tink_crypto_tink_go with a local one.
-grep -r "com_github_tink_crypto_tink_go" -l --include="*.bazel" . \
+# Replace com_github_tink_crypto_tink_go_v2 with a local one.
+grep -r "com_github_tink_crypto_tink_go_v2" -l --include="*.bazel" . \
   | xargs sed -i '.bak' \
-      "s~com_github_tink_crypto_tink_go~com_github_tink_crypto_tink_go_local~g"
+      "s~com_github_tink_crypto_tink_go_v2~com_github_tink_crypto_tink_go_local~g"
 
 sed -i '.bak' \
   's~workspace(name = "tink_go_awskms")~workspace(name = "tink_go_awskms")\