diff --git a/TestModels/Aggregate/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Aggregate/runtimes/go/ImplementationFromDafny-go/go.mod index e6cd7cfb70..d3faa6204a 100644 --- a/TestModels/Aggregate/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Aggregate/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Aggregate go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Aggregate/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Aggregate/runtimes/go/TestsFromDafny-go/go.mod index 65cf5da71c..363765917c 100644 --- a/TestModels/Aggregate/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Aggregate/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Aggregate/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/Aggregate v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Aggregate/runtimes/python/pyproject.toml b/TestModels/Aggregate/runtimes/python/pyproject.toml index c316e7f0d9..df6c01c315 100644 --- a/TestModels/Aggregate/runtimes/python/pyproject.toml +++ b/TestModels/Aggregate/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ smithy-dafny-standard-library = {path = "../../../dafny-dependencies/StandardLib pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/CallingAWSSDKFromLocalService/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/CallingAWSSDKFromLocalService/runtimes/go/ImplementationFromDafny-go/go.mod index b321409890..145bf522ac 100644 --- a/TestModels/CallingAWSSDKFromLocalService/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/CallingAWSSDKFromLocalService/runtimes/go/ImplementationFromDafny-go/go.mod @@ -5,7 +5,7 @@ go 1.23.0 require ( github.com/aws/smithy-go v1.22.0 github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 github.com/smithy-lang/smithy-dafny/ddbv2 v0.0.0 github.com/smithy-lang/smithy-dafny/kmsv2 v0.0.0 ) @@ -29,7 +29,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ replace github.com/smithy-lang/smithy-dafny/kmsv2 => ../../../../aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/CallingAWSSDKFromLocalService/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/CallingAWSSDKFromLocalService/runtimes/go/TestsFromDafny-go/go.mod index 9cfd3fecff..b53cad34a0 100644 --- a/TestModels/CallingAWSSDKFromLocalService/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/CallingAWSSDKFromLocalService/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/CallingAWSSDKFromLocalServ go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 @@ -33,7 +33,7 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/CallingAWSSDKFromLocalService v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ replace github.com/smithy-lang/smithy-dafny/kmsv2 => ../../../../aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/CodegenPatches/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/CodegenPatches/runtimes/go/ImplementationFromDafny-go/go.mod index e06022140c..ffb30e75d6 100644 --- a/TestModels/CodegenPatches/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/CodegenPatches/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/CodegenPatches go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/WrappedSimpleCodegenPatchesService/shim.go b/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/WrappedSimpleCodegenPatchesService/shim.go index e57b0a9801..f139791c17 100644 --- a/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/WrappedSimpleCodegenPatchesService/shim.go +++ b/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/WrappedSimpleCodegenPatchesService/shim.go @@ -6,7 +6,7 @@ import ( "context" "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/CodegenPatches/SimpleCodegenpatchesTypes" "github.com/smithy-lang/smithy-dafny/TestModels/CodegenPatches/simplecodegenpatchessmithygenerated" ) diff --git a/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/go.mod index 83264d16b3..62296ee68f 100644 --- a/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/CodegenPatches/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/CodegenPatches/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/CodegenPatches v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/CodegenPatches/runtimes/python/pyproject.toml b/TestModels/CodegenPatches/runtimes/python/pyproject.toml index 929dc8a477..708e2e1e90 100644 --- a/TestModels/CodegenPatches/runtimes/python/pyproject.toml +++ b/TestModels/CodegenPatches/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Constraints/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Constraints/runtimes/go/ImplementationFromDafny-go/go.mod index 4e3b3f6e0d..8d6d53ba5d 100644 --- a/TestModels/Constraints/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Constraints/runtimes/go/ImplementationFromDafny-go/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Constraints/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Constraints/runtimes/go/TestsFromDafny-go/go.mod index 86b1b4a308..7108430bef 100644 --- a/TestModels/Constraints/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Constraints/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Constraints/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -11,4 +11,4 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/Constraints v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Constraints/runtimes/python/pyproject.toml b/TestModels/Constraints/runtimes/python/pyproject.toml index d915072fee..e2458d4012 100644 --- a/TestModels/Constraints/runtimes/python/pyproject.toml +++ b/TestModels/Constraints/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Constructor/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Constructor/runtimes/go/ImplementationFromDafny-go/go.mod index 812cbfac2b..abe84acb68 100644 --- a/TestModels/Constructor/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Constructor/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Constructor go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Constructor/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Constructor/runtimes/go/TestsFromDafny-go/go.mod index 1491d3909f..a703951d0f 100644 --- a/TestModels/Constructor/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Constructor/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Constructor/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -11,4 +11,4 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/Constructor v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Constructor/runtimes/python/pyproject.toml b/TestModels/Constructor/runtimes/python/pyproject.toml index 26cbf173cd..4891490393 100644 --- a/TestModels/Constructor/runtimes/python/pyproject.toml +++ b/TestModels/Constructor/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ smithy-dafny-standard-library = { path = "../../../dafny-dependencies/StandardLi pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Dependencies/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Dependencies/runtimes/go/ImplementationFromDafny-go/go.mod index cb6bd4e77c..1101bd2ea8 100644 --- a/TestModels/Dependencies/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Dependencies/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Dependencies go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/smithy-lang/smithy-dafny/TestModels/Constraints v0.0.0 @@ -15,7 +15,7 @@ require ( github.com/smithy-lang/smithy-dafny/TestModels/Errors v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ replace github.com/smithy-lang/smithy-dafny/TestModels/Constraints v0.0.0 => ../../../../Constraints/runtimes/go/ImplementationFromDafny-go diff --git a/TestModels/Dependencies/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Dependencies/runtimes/go/TestsFromDafny-go/go.mod index 966f231642..bf98f29e32 100644 --- a/TestModels/Dependencies/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Dependencies/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Dependencies/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/smithy-lang/smithy-dafny/TestModels/Constraints v0.0.0 @@ -20,7 +20,7 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/Dependencies v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ replace github.com/smithy-lang/smithy-dafny/TestModels/Constraints v0.0.0 => ../../../../Constraints/runtimes/go/ImplementationFromDafny-go diff --git a/TestModels/Dependencies/runtimes/python/pyproject.toml b/TestModels/Dependencies/runtimes/python/pyproject.toml index 7bfcba1cec..063e72c51b 100644 --- a/TestModels/Dependencies/runtimes/python/pyproject.toml +++ b/TestModels/Dependencies/runtimes/python/pyproject.toml @@ -26,5 +26,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Documentation/runtimes/python/pyproject.toml b/TestModels/Documentation/runtimes/python/pyproject.toml index 86ce0d31f1..f17173173b 100644 --- a/TestModels/Documentation/runtimes/python/pyproject.toml +++ b/TestModels/Documentation/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Errors/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Errors/runtimes/go/ImplementationFromDafny-go/go.mod index 5a8e2bdc49..c6f53fb237 100644 --- a/TestModels/Errors/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Errors/runtimes/go/ImplementationFromDafny-go/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Errors/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Errors/runtimes/go/TestsFromDafny-go/go.mod index 83e27c3741..3a7f13e29c 100644 --- a/TestModels/Errors/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Errors/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Errors/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/Errors v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Errors/runtimes/python/pyproject.toml b/TestModels/Errors/runtimes/python/pyproject.toml index 58de6999a2..599ac40177 100644 --- a/TestModels/Errors/runtimes/python/pyproject.toml +++ b/TestModels/Errors/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Extendable/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Extendable/runtimes/go/ImplementationFromDafny-go/go.mod index 7e76253453..2684baa832 100644 --- a/TestModels/Extendable/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Extendable/runtimes/go/ImplementationFromDafny-go/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Extendable/runtimes/go/TestsFromDafny-go/WrappedSimpleExtendableResources/shim.go b/TestModels/Extendable/runtimes/go/TestsFromDafny-go/WrappedSimpleExtendableResources/shim.go index 0f04354751..94a4602b2f 100644 --- a/TestModels/Extendable/runtimes/go/TestsFromDafny-go/WrappedSimpleExtendableResources/shim.go +++ b/TestModels/Extendable/runtimes/go/TestsFromDafny-go/WrappedSimpleExtendableResources/shim.go @@ -5,7 +5,7 @@ package WrappedSimpleExtendableResources import ( "context" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/Extendable/SimpleExtendableResourcesTypes" "github.com/smithy-lang/smithy-dafny/TestModels/Extendable/simpleextendableresourcessmithygenerated" ) diff --git a/TestModels/Extendable/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Extendable/runtimes/go/TestsFromDafny-go/go.mod index 80636c0830..538cf463ed 100644 --- a/TestModels/Extendable/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Extendable/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Extendable/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -11,4 +11,4 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/Extendable v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Extendable/runtimes/python/pyproject.toml b/TestModels/Extendable/runtimes/python/pyproject.toml index 3dda156150..b548822104 100644 --- a/TestModels/Extendable/runtimes/python/pyproject.toml +++ b/TestModels/Extendable/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/ExternConstructor/extern.go b/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/ExternConstructor/extern.go index 7c7eb6fbd0..1a0db0270b 100644 --- a/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/ExternConstructor/extern.go +++ b/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/ExternConstructor/extern.go @@ -3,8 +3,8 @@ package ExternConstructor import ( "fmt" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/Extern/SimpleDafnyExternTypes" ) diff --git a/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/SimpleExternImpl/extern.go b/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/SimpleExternImpl/extern.go index 75656d2111..9ca7ec8fb0 100644 --- a/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/SimpleExternImpl/extern.go +++ b/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/SimpleExternImpl/extern.go @@ -1,7 +1,7 @@ package SimpleExternImpl import ( - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/Extern/SimpleDafnyExternTypes" ) diff --git a/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/go.mod index dbfb329832..f66674d953 100644 --- a/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Extern/runtimes/go/ImplementationFromDafny-go/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Extern/runtimes/go/TestsFromDafny-go/WrappedSimpleExternService/shim.go b/TestModels/Extern/runtimes/go/TestsFromDafny-go/WrappedSimpleExternService/shim.go index 8dc66307da..5a7e1b72a9 100644 --- a/TestModels/Extern/runtimes/go/TestsFromDafny-go/WrappedSimpleExternService/shim.go +++ b/TestModels/Extern/runtimes/go/TestsFromDafny-go/WrappedSimpleExternService/shim.go @@ -6,7 +6,7 @@ import ( "context" "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/Extern/SimpleDafnyExternTypes" "github.com/smithy-lang/smithy-dafny/TestModels/Extern/simpledafnyexternsmithygenerated" ) diff --git a/TestModels/Extern/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Extern/runtimes/go/TestsFromDafny-go/go.mod index f5ecbfebfe..3f1ab3044f 100644 --- a/TestModels/Extern/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Extern/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Extern/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -11,4 +11,4 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/Extern v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Extern/runtimes/python/pyproject.toml b/TestModels/Extern/runtimes/python/pyproject.toml index f04a9d3eb5..b2933305db 100644 --- a/TestModels/Extern/runtimes/python/pyproject.toml +++ b/TestModels/Extern/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/LanguageSpecificLogic/runtimes/python/pyproject.toml b/TestModels/LanguageSpecificLogic/runtimes/python/pyproject.toml index f822669abd..670cd1925c 100644 --- a/TestModels/LanguageSpecificLogic/runtimes/python/pyproject.toml +++ b/TestModels/LanguageSpecificLogic/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/LocalService/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/LocalService/runtimes/go/ImplementationFromDafny-go/go.mod index 77e9a36e41..5d602df230 100644 --- a/TestModels/LocalService/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/LocalService/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/LocalService go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/LocalService/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/LocalService/runtimes/go/TestsFromDafny-go/go.mod index 246906fe38..39d276e976 100644 --- a/TestModels/LocalService/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/LocalService/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/LocalService/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/LocalService v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/LocalService/runtimes/python/pyproject.toml b/TestModels/LocalService/runtimes/python/pyproject.toml index 54bc084e09..79ab5971b5 100644 --- a/TestModels/LocalService/runtimes/python/pyproject.toml +++ b/TestModels/LocalService/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/MultipleModels/runtimes/python/pyproject.toml b/TestModels/MultipleModels/runtimes/python/pyproject.toml index e4b6f438bc..abcace4cdf 100644 --- a/TestModels/MultipleModels/runtimes/python/pyproject.toml +++ b/TestModels/MultipleModels/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Positional/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Positional/runtimes/go/ImplementationFromDafny-go/go.mod index 1d3413ba62..a9671ae76a 100644 --- a/TestModels/Positional/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Positional/runtimes/go/ImplementationFromDafny-go/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Positional/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Positional/runtimes/go/TestsFromDafny-go/go.mod index c8662deeab..a657b362fb 100644 --- a/TestModels/Positional/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Positional/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Positional/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -11,4 +11,4 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/Positional v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Positional/runtimes/python/pyproject.toml b/TestModels/Positional/runtimes/python/pyproject.toml index 2880a0bb5f..a17263ebac 100644 --- a/TestModels/Positional/runtimes/python/pyproject.toml +++ b/TestModels/Positional/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/RecursiveShape/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/RecursiveShape/runtimes/go/ImplementationFromDafny-go/go.mod index 9f9cae5d70..dad64542e2 100644 --- a/TestModels/RecursiveShape/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/RecursiveShape/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/RecursiveShape go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/RecursiveShape/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/RecursiveShape/runtimes/go/TestsFromDafny-go/go.mod index 36f8dfeeca..3d4254153e 100644 --- a/TestModels/RecursiveShape/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/RecursiveShape/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/RecursiveShape/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -11,4 +11,4 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/RecursiveShape v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Refinement/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Refinement/runtimes/go/ImplementationFromDafny-go/go.mod index dd11d0ecf0..00ade67842 100644 --- a/TestModels/Refinement/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Refinement/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Refinement go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Refinement/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Refinement/runtimes/go/TestsFromDafny-go/go.mod index 446097b79f..ef14d161a9 100644 --- a/TestModels/Refinement/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Refinement/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Refinement/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -11,4 +11,4 @@ require ( replace github.com/smithy-lang/smithy-dafny/TestModels/Refinement => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Refinement/runtimes/python/pyproject.toml b/TestModels/Refinement/runtimes/python/pyproject.toml index 241e642020..30898e31e5 100644 --- a/TestModels/Refinement/runtimes/python/pyproject.toml +++ b/TestModels/Refinement/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/Resource/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Resource/runtimes/go/ImplementationFromDafny-go/go.mod index d1d72c414b..9be1b10975 100644 --- a/TestModels/Resource/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Resource/runtimes/go/ImplementationFromDafny-go/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Resource/runtimes/go/TestsFromDafny-go/WrappedSimpleResources/shim.go b/TestModels/Resource/runtimes/go/TestsFromDafny-go/WrappedSimpleResources/shim.go index 076b4bb349..1d6c0983c3 100644 --- a/TestModels/Resource/runtimes/go/TestsFromDafny-go/WrappedSimpleResources/shim.go +++ b/TestModels/Resource/runtimes/go/TestsFromDafny-go/WrappedSimpleResources/shim.go @@ -5,7 +5,7 @@ package WrappedSimpleResources import ( "context" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/Resource/SimpleResourcesTypes" "github.com/smithy-lang/smithy-dafny/TestModels/Resource/simpleresourcessmithygenerated" ) diff --git a/TestModels/Resource/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Resource/runtimes/go/TestsFromDafny-go/go.mod index b4ce4bbfec..ad32d96df0 100644 --- a/TestModels/Resource/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Resource/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Resource/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -14,4 +14,4 @@ replace github.com/smithy-lang/smithy-dafny/TestModels/Resource v0.0.0 => ../Imp //TODO: Drop this after Dafny fixes the https://t.corp.amazon.com/P150784381 replace github.com/dafny-lang/DafnyRuntimeGo => ../../../../../DafnyRuntimeGo/ -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Resource/runtimes/python/pyproject.toml b/TestModels/Resource/runtimes/python/pyproject.toml index a01ce737bc..2c60614763 100644 --- a/TestModels/Resource/runtimes/python/pyproject.toml +++ b/TestModels/Resource/runtimes/python/pyproject.toml @@ -21,5 +21,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleBlob/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleBlob/runtimes/go/ImplementationFromDafny-go/go.mod index ce885fe04c..8d8e35ca69 100644 --- a/TestModels/SimpleTypes/SimpleBlob/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleBlob/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleBlob go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleBlob/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleBlob/runtimes/go/TestsFromDafny-go/go.mod index 7895671318..fd2f692516 100644 --- a/TestModels/SimpleTypes/SimpleBlob/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleBlob/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleBlob/tes go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleBlob v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml index c94ead4a44..b56b2657e1 100644 --- a/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml @@ -21,5 +21,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/ImplementationFromDafny-go/go.mod index 3e1c8783c3..99149ede95 100644 --- a/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleBoolean go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/TestsFromDafny-go/go.mod index bff187cf16..dad7e89060 100644 --- a/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleBoolean/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleBoolean/ go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleBoolean v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleBoolean/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleBoolean/runtimes/python/pyproject.toml index 3c57673d34..eaab1ffa37 100644 --- a/TestModels/SimpleTypes/SimpleBoolean/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleBoolean/runtimes/python/pyproject.toml @@ -20,5 +20,5 @@ smithy-dafny-standard-library = {path = "../../../../dafny-dependencies/Standard pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleDouble/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleDouble/runtimes/go/ImplementationFromDafny-go/go.mod index 1523c314d7..9f1f297e8e 100644 --- a/TestModels/SimpleTypes/SimpleDouble/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleDouble/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleDouble go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesDouble/shim.go b/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesDouble/shim.go index d02bfd2432..89ae361041 100644 --- a/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesDouble/shim.go +++ b/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesDouble/shim.go @@ -6,7 +6,7 @@ import ( "context" "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleDouble/SimpleTypesSmithyDoubleTypes" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleDouble/simpletypessmithydoublesmithygenerated" ) diff --git a/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/go.mod index 0cfe89b5bf..e6f7368aa0 100644 --- a/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleDouble/runtimes/go/TestsFromDafny-go/go.mod @@ -4,10 +4,10 @@ go 1.23.0 replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleDouble v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleDouble v0.0.0 ) diff --git a/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml index ac6f9f5a84..3530acec4e 100644 --- a/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml @@ -21,6 +21,6 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleEnum/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleEnum/runtimes/go/ImplementationFromDafny-go/go.mod index 7b5393479f..b5677368ff 100644 --- a/TestModels/SimpleTypes/SimpleEnum/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleEnum/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnum go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesEnumService/shim.go b/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesEnumService/shim.go index 69a9b8d76a..bee7bc00e9 100644 --- a/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesEnumService/shim.go +++ b/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesEnumService/shim.go @@ -5,7 +5,7 @@ package WrappedSimpleTypesEnumService import ( "context" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnum/SimpleTypesSmithyEnumTypes" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnum/simpletypessmithyenumsmithygenerated" ) diff --git a/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/go.mod index 0de6a10138..a107a5f1dc 100644 --- a/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleEnum/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnum/tes go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnum v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml index 53581c761f..2d34d7726c 100644 --- a/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml @@ -21,5 +21,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/ImplementationFromDafny-go/go.mod index 4e4f20405f..9f155ae52e 100644 --- a/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnumV2 go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/TestsFromDafny-go/go.mod index 7fb97ebd7f..712636d89b 100644 --- a/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleEnumV2/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnumV2/t go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleEnumV2 v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleEnumV2/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleEnumV2/runtimes/python/pyproject.toml index c7fa254f4c..9d6cc1bb91 100644 --- a/TestModels/SimpleTypes/SimpleEnumV2/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleEnumV2/runtimes/python/pyproject.toml @@ -21,5 +21,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleInteger/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleInteger/runtimes/go/ImplementationFromDafny-go/go.mod index 42906f14ac..d46ee5f8a4 100644 --- a/TestModels/SimpleTypes/SimpleInteger/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleInteger/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleInteger go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleInteger/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleInteger/runtimes/go/TestsFromDafny-go/go.mod index bc7517b4f2..acee7f728e 100644 --- a/TestModels/SimpleTypes/SimpleInteger/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleInteger/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleInteger/ go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleInteger v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml index 98f5aa44ed..89a7e5e8c7 100644 --- a/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml @@ -21,5 +21,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleLong/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleLong/runtimes/go/ImplementationFromDafny-go/go.mod index a8ac314a86..ae6e0973e4 100644 --- a/TestModels/SimpleTypes/SimpleLong/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleLong/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleLong go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesLongService/shim.go b/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesLongService/shim.go index 704654e787..9cf5edd733 100644 --- a/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesLongService/shim.go +++ b/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesLongService/shim.go @@ -6,7 +6,7 @@ import ( "context" "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleLong/SimpleTypesSmithyLongTypes" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleLong/simpletypessmithylongsmithygenerated" ) diff --git a/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/go.mod index 10dfd23f62..e75de17e73 100644 --- a/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleLong/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleLong/tes go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleLong v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml index 9d733cf0b2..04d0901052 100644 --- a/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml @@ -21,5 +21,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleString/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleString/runtimes/go/ImplementationFromDafny-go/go.mod index b97f97922a..99c14bcd8f 100644 --- a/TestModels/SimpleTypes/SimpleString/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleString/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleString go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesStringService/shim.go b/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesStringService/shim.go index fc00d2e1bd..8be859f493 100644 --- a/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesStringService/shim.go +++ b/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/WrappedSimpleTypesStringService/shim.go @@ -6,7 +6,7 @@ import ( "context" "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleString/SimpleTypesSmithyStringTypes" "github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleString/simpletypessmithystringsmithygenerated" ) diff --git a/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/go.mod index 2118fbe921..c25a1413f0 100644 --- a/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleString/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleString/t go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleString v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml index fee31428d2..463ad9d797 100644 --- a/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml +++ b/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml @@ -21,5 +21,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/ImplementationFromDafny-go/go.mod index 599af36960..f4188d1f9f 100644 --- a/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleTimestam go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/TestsFromDafny-go/go.mod index 7aa731b2da..2bd85f42d8 100644 --- a/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/SimpleTypes/SimpleTimestamp/runtimes/go/TestsFromDafny-go/go.mod @@ -4,11 +4,11 @@ go 1.23.0 replace github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleTimestamp v0.0.0 => ../ImplementationFromDafny-go -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 github.com/smithy-lang/smithy-dafny/TestModels/SimpleTypes/SimpleTimestamp v0.0.0 ) -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Union/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/Union/runtimes/go/ImplementationFromDafny-go/go.mod index d29a46b200..981a54eaac 100644 --- a/TestModels/Union/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/Union/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,8 +2,8 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Union go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Union/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/Union/runtimes/go/TestsFromDafny-go/go.mod index d9a459d74f..f8810d7f93 100644 --- a/TestModels/Union/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/Union/runtimes/go/TestsFromDafny-go/go.mod @@ -2,7 +2,7 @@ module github.com/smithy-lang/smithy-dafny/TestModels/Union/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 require ( github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 @@ -10,4 +10,4 @@ require ( ) replace github.com/smithy-lang/smithy-dafny/TestModels/Union v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ diff --git a/TestModels/Union/runtimes/python/pyproject.toml b/TestModels/Union/runtimes/python/pyproject.toml index 1c0ca68453..bbe2e615c9 100644 --- a/TestModels/Union/runtimes/python/pyproject.toml +++ b/TestModels/Union/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go b/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go index ddcc2e8d87..480559d65e 100644 --- a/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go +++ b/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go @@ -3,10 +3,10 @@ package Com_Amazonaws_Dynamodb import ( "context" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/dynamodb" _dafny "github.com/dafny-lang/DafnyRuntimeGo/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" "github.com/smithy-lang/smithy-dafny/ddb/ComAmazonawsDynamodbTypes" "github.com/smithy-lang/smithy-dafny/ddb/DynamoDBwrapped" ) diff --git a/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/go.mod index 35a5ba1bdb..6fcfc645e5 100644 --- a/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/aws-sdks/ddb/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,12 +2,12 @@ module github.com/smithy-lang/smithy-dafny/ddb go 1.23.0 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0-00010101000000-000000000000 ) require ( diff --git a/TestModels/aws-sdks/ddb/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/aws-sdks/ddb/runtimes/go/TestsFromDafny-go/go.mod index fb3d9117f1..f41066ffd1 100644 --- a/TestModels/aws-sdks/ddb/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/aws-sdks/ddb/runtimes/go/TestsFromDafny-go/go.mod @@ -3,12 +3,12 @@ module github.com/smithy-lang/smithy-dafny/ddb/test go 1.23.0 replace github.com/smithy-lang/smithy-dafny/ddb v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0-00010101000000-000000000000 github.com/smithy-lang/smithy-dafny/ddb v0.0.0 ) diff --git a/TestModels/aws-sdks/ddb/runtimes/python/pyproject.toml b/TestModels/aws-sdks/ddb/runtimes/python/pyproject.toml index 3cefaceda4..c1995a89e5 100644 --- a/TestModels/aws-sdks/ddb/runtimes/python/pyproject.toml +++ b/TestModels/aws-sdks/ddb/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go b/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go index c2d5fdaad3..db6d9fc66a 100644 --- a/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go +++ b/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Dynamodb/extern.go @@ -3,10 +3,10 @@ package Com_Amazonaws_Dynamodb import ( "context" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/dynamodb" _dafny "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" "github.com/smithy-lang/smithy-dafny/ddbv2/ComAmazonawsDynamodbTypes" "github.com/smithy-lang/smithy-dafny/ddbv2/DynamoDBwrapped" ) diff --git a/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/go.mod index 335b4a3b20..c39518c34f 100644 --- a/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/aws-sdks/ddbv2/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,14 +2,14 @@ module github.com/smithy-lang/smithy-dafny/ddbv2 go 1.23.0 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ require ( github.com/aws/aws-sdk-go-v2/config v1.28.3 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 github.com/aws/smithy-go v1.22.0 github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0-00010101000000-000000000000 ) require ( diff --git a/TestModels/aws-sdks/ddbv2/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/aws-sdks/ddbv2/runtimes/go/TestsFromDafny-go/go.mod index 556c7a24cd..d59146e217 100644 --- a/TestModels/aws-sdks/ddbv2/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/aws-sdks/ddbv2/runtimes/go/TestsFromDafny-go/go.mod @@ -3,13 +3,13 @@ module github.com/smithy-lang/smithy-dafny/ddbv2/test go 1.23.0 replace github.com/smithy-lang/smithy-dafny/ddbv2 v0.0.0 => ../ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 github.com/aws/smithy-go v1.22.0 github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0-00010101000000-000000000000 github.com/smithy-lang/smithy-dafny/ddbv2 v0.0.0 ) diff --git a/TestModels/aws-sdks/ddbv2/runtimes/python/pyproject.toml b/TestModels/aws-sdks/ddbv2/runtimes/python/pyproject.toml index 3cefaceda4..c1995a89e5 100644 --- a/TestModels/aws-sdks/ddbv2/runtimes/python/pyproject.toml +++ b/TestModels/aws-sdks/ddbv2/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/aws-sdks/kms/runtimes/python/pyproject.toml b/TestModels/aws-sdks/kms/runtimes/python/pyproject.toml index 87e062b899..db5a61b9a4 100644 --- a/TestModels/aws-sdks/kms/runtimes/python/pyproject.toml +++ b/TestModels/aws-sdks/kms/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Kms/extern.go b/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Kms/extern.go index f462d40fd5..71c7197ea8 100644 --- a/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Kms/extern.go +++ b/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/Com_Amazonaws_Kms/extern.go @@ -3,10 +3,10 @@ package Com_Amazonaws_Kms import ( "context" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/kms" _dafny "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" ComAmazonawsKmsTypes "github.com/smithy-lang/smithy-dafny/kmsv2/ComAmazonawsKmsTypes" "github.com/smithy-lang/smithy-dafny/kmsv2/KMSwrapped" ) diff --git a/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/go.mod index c444d62d36..f331443bc0 100644 --- a/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/aws-sdks/kmsv2/runtimes/go/ImplementationFromDafny-go/go.mod @@ -2,14 +2,14 @@ module github.com/smithy-lang/smithy-dafny/kmsv2 go 1.23.0 -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ require ( github.com/aws/aws-sdk-go-v2/config v1.28.0 github.com/aws/aws-sdk-go-v2/service/kms v1.35.5 github.com/aws/smithy-go v1.22.0 github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0-00010101000000-000000000000 ) require ( diff --git a/TestModels/aws-sdks/kmsv2/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/aws-sdks/kmsv2/runtimes/go/TestsFromDafny-go/go.mod index c697d35c71..d9412901b9 100644 --- a/TestModels/aws-sdks/kmsv2/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/aws-sdks/kmsv2/runtimes/go/TestsFromDafny-go/go.mod @@ -4,13 +4,13 @@ go 1.23.0 replace github.com/smithy-lang/smithy-dafny/kmsv2 v0.0.0 => ./../../../../kmsv2/runtimes/go/ImplementationFromDafny-go -replace github.com/dafny-lang/DafnyStandardLibGo => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library => ../../../../../dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.35.5 github.com/aws/smithy-go v1.22.0 github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 - github.com/dafny-lang/DafnyStandardLibGo v0.0.0-00010101000000-000000000000 + github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0-00010101000000-000000000000 github.com/smithy-lang/smithy-dafny/kmsv2 v0.0.0 ) diff --git a/TestModels/aws-sdks/kmsv2/runtimes/python/pyproject.toml b/TestModels/aws-sdks/kmsv2/runtimes/python/pyproject.toml index 87e062b899..db5a61b9a4 100644 --- a/TestModels/aws-sdks/kmsv2/runtimes/python/pyproject.toml +++ b/TestModels/aws-sdks/kmsv2/runtimes/python/pyproject.toml @@ -22,5 +22,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/aws-sdks/s3/runtimes/python/pyproject.toml b/TestModels/aws-sdks/s3/runtimes/python/pyproject.toml index d76d1df845..d1face08c1 100644 --- a/TestModels/aws-sdks/s3/runtimes/python/pyproject.toml +++ b/TestModels/aws-sdks/s3/runtimes/python/pyproject.toml @@ -19,5 +19,5 @@ smithy-dafny-standard-library = {path = "../../../../dafny-dependencies/Standard pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/TestModels/dafny-dependencies/StandardLibrary/Makefile b/TestModels/dafny-dependencies/StandardLibrary/Makefile index 8bb9bf1d61..af2e417bce 100644 --- a/TestModels/dafny-dependencies/StandardLibrary/Makefile +++ b/TestModels/dafny-dependencies/StandardLibrary/Makefile @@ -11,7 +11,7 @@ MAX_RESOURCE_COUNT=500000000 PYTHON_MODULE_NAME=smithy_dafny_standard_library LIBRARIES := -GO_MODULE_NAME="github.com/dafny-lang/DafnyStandardLibGo" +GO_MODULE_NAME="github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library" # define standard colors ifneq (,$(findstring xterm,${TERM})) diff --git a/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/UTF8/externs.go b/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/UTF8/externs.go index 1d2a66ba82..3fa805c776 100644 --- a/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/UTF8/externs.go +++ b/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/UTF8/externs.go @@ -6,8 +6,8 @@ import ( "unicode/utf16" "unicode/utf8" + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/Wrappers" "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny" - "github.com/dafny-lang/DafnyStandardLibGo/Wrappers" ) //IMP: The below extern implementations are only compatible diff --git a/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/go.mod b/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/go.mod index b9b0188295..cf7087e4e0 100644 --- a/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/go.mod +++ b/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/ImplementationFromDafny-go/go.mod @@ -1,4 +1,4 @@ -module github.com/dafny-lang/DafnyStandardLibGo +module github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library go 1.23.0 diff --git a/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/TestsFromDafny-go/go.mod b/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/TestsFromDafny-go/go.mod index e79776a3c1..c14643be46 100644 --- a/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/TestsFromDafny-go/go.mod +++ b/TestModels/dafny-dependencies/StandardLibrary/runtimes/go/TestsFromDafny-go/go.mod @@ -1,10 +1,10 @@ -module github.com/dafny-lang/DafnyStandardLibGo/test +module github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library/test go 1.23.0 -require github.com/dafny-lang/DafnyStandardLibGo v0.0.0 +require github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 -replace github.com/dafny-lang/DafnyStandardLibGo v0.0.0 => ../ImplementationFromDafny-go +replace github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library v0.0.0 => ../ImplementationFromDafny-go require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.9.1 diff --git a/TestModels/dafny-dependencies/StandardLibrary/runtimes/python/pyproject.toml b/TestModels/dafny-dependencies/StandardLibrary/runtimes/python/pyproject.toml index 6edb11b837..c5d2a0ff18 100644 --- a/TestModels/dafny-dependencies/StandardLibrary/runtimes/python/pyproject.toml +++ b/TestModels/dafny-dependencies/StandardLibrary/runtimes/python/pyproject.toml @@ -18,5 +18,5 @@ DafnyRuntimePython = "^4.7.0" pytest = "^7.4.0" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core<2.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientShimGenerator.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientShimGenerator.java index d0d03c1845..7cc04c6706 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientShimGenerator.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientShimGenerator.java @@ -1,6 +1,7 @@ package software.amazon.polymorph.smithygo.awssdk; import static software.amazon.polymorph.smithygo.utils.Constants.DAFNY_RUNTIME_GO_LIBRARY_MODULE; +import static software.amazon.polymorph.smithygo.utils.Constants.SMITHY_DAFNY_STD_LIB_GO; import software.amazon.polymorph.smithygo.codegen.AddOperationShapes; import software.amazon.polymorph.smithygo.codegen.GenerationContext; @@ -68,10 +69,7 @@ void generateShim() { .getNamespace() ) ); - writer.addImportFromModule( - "github.com/dafny-lang/DafnyStandardLibGo", - "Wrappers" - ); + writer.addImportFromModule(SMITHY_DAFNY_STD_LIB_GO, "Wrappers"); writer.addUseImports(SmithyGoDependency.CONTEXT); writer.addImportFromModule( SmithyNameResolver.getGoModuleNameForSmithyNamespace( diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientTypeConversionProtocol.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientTypeConversionProtocol.java index 7ad91d582b..ca4599cc4f 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientTypeConversionProtocol.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/DafnyAwsSdkClientTypeConversionProtocol.java @@ -5,7 +5,9 @@ import static software.amazon.polymorph.smithygo.utils.Constants.DAFNY_RUNTIME_GO_LIBRARY_MODULE; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; +import java.util.stream.Collectors; import software.amazon.polymorph.smithygo.awssdk.shapevisitor.AwsSdkToDafnyShapeVisitor; import software.amazon.polymorph.smithygo.awssdk.shapevisitor.DafnyToAwsSdkShapeVisitor; import software.amazon.polymorph.smithygo.awssdk.shapevisitor.ShapeVisitorHelper; @@ -62,6 +64,8 @@ public void generateSerializers(final GenerationContext context) { final var writerDelegator = context.writerDelegator(); serviceShape .getOperations() + .stream() + .sorted() .forEach(eachOperation -> { final var awsNormalizedOperation = awsNormalizedModel.expectShape( eachOperation, @@ -213,6 +217,8 @@ public void generateDeserializers(final GenerationContext context) { serviceShape .getOperations() + .stream() + .sorted() .forEach(eachOperation -> { final var awsNormalizedOperationShape = awsNormalizedModel.expectShape( eachOperation, @@ -487,9 +493,11 @@ private void generateResponseDeserializer( private void generateErrorSerializer(final GenerationContext context) { final Set alreadyVisited = new HashSet<>(); - final var errorShapes = awsNormalizedModel.getShapesWithTrait( - ErrorTrait.class - ); + final var errorShapes = awsNormalizedModel + .getShapesWithTrait(ErrorTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); for (final var errorShape : errorShapes) { if ( @@ -634,9 +642,11 @@ func Error_ToDafny(err error)($L.Error) { private void generateErrorDeserializer(final GenerationContext context) { final Set alreadyVisited = new HashSet<>(); - final var errorShapes = awsNormalizedModel.getShapesWithTrait( - ErrorTrait.class - ); + final var errorShapes = awsNormalizedModel + .getShapesWithTrait(ErrorTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); for (final var errorShape : errorShapes) { if ( !errorShape @@ -749,9 +759,7 @@ func Error_FromDafny(err $L.Error)(error) { """, DafnyNameResolver.dafnyTypesNamespace(serviceShape), writer.consumer(w -> { - for (final var error : awsNormalizedModel.getShapesWithTrait( - ErrorTrait.class - )) { + for (final var error : errorShapes) { w.write( """ if err.Is_$L() { diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/AwsSdkToDafnyShapeVisitor.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/AwsSdkToDafnyShapeVisitor.java index b7066908fb..fdbed06cde 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/AwsSdkToDafnyShapeVisitor.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/AwsSdkToDafnyShapeVisitor.java @@ -2,8 +2,9 @@ import static software.amazon.polymorph.smithygo.localservice.nameresolver.Constants.DOT; import static software.amazon.polymorph.smithygo.utils.Constants.DAFNY_RUNTIME_GO_LIBRARY_MODULE; +import static software.amazon.polymorph.smithygo.utils.Constants.SMITHY_DAFNY_STD_LIB_GO; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import software.amazon.polymorph.smithygo.awssdk.AwsSdkGoPointableIndex; @@ -48,7 +49,7 @@ public class AwsSdkToDafnyShapeVisitor extends ShapeVisitor.Default { protected boolean isPointerType; //TODO: Ideally this shouldn't be static but with current design we need to access this across instances. private static final Map memberShapeConversionFuncMap = - new HashMap<>(); + new LinkedHashMap<>(); public AwsSdkToDafnyShapeVisitor( final GenerationContext context, @@ -140,10 +141,7 @@ public String blobShape(final BlobShape shape) { public String structureShape(final StructureShape shape) { final var typeConversionMethodBuilder = new StringBuilder(); - writer.addImportFromModule( - "github.com/dafny-lang/DafnyStandardLibGo", - "Wrappers" - ); + writer.addImportFromModule(SMITHY_DAFNY_STD_LIB_GO, "Wrappers"); writer.addImportFromModule( SmithyNameResolver.getGoModuleNameForSmithyNamespace( shape.toShapeId().getNamespace() diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/DafnyToAwsSdkShapeVisitor.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/DafnyToAwsSdkShapeVisitor.java index 2013cfe57b..499e7aabec 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/DafnyToAwsSdkShapeVisitor.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/awssdk/shapevisitor/DafnyToAwsSdkShapeVisitor.java @@ -1,6 +1,7 @@ package software.amazon.polymorph.smithygo.awssdk.shapevisitor; import static software.amazon.polymorph.smithygo.utils.Constants.DAFNY_RUNTIME_GO_LIBRARY_MODULE; +import static software.amazon.polymorph.smithygo.utils.Constants.SMITHY_DAFNY_STD_LIB_GO; import java.util.*; import software.amazon.polymorph.smithygo.awssdk.AwsSdkGoPointableIndex; @@ -49,7 +50,7 @@ public class DafnyToAwsSdkShapeVisitor extends ShapeVisitor.Default { //TODO: Ideally this shouldn't be static but with current design we need to access this across instances. private static final Map memberShapeConversionFuncMap = - new HashMap<>(); + new LinkedHashMap<>(); public DafnyToAwsSdkShapeVisitor( final GenerationContext context, @@ -600,10 +601,7 @@ public String doubleShape(final DoubleShape shape) { @Override public String unionShape(final UnionShape shape) { writer.addImportFromModule(DAFNY_RUNTIME_GO_LIBRARY_MODULE, "dafny"); - writer.addImportFromModule( - "github.com/dafny-lang/DafnyStandardLibGo", - "Wrappers" - ); + writer.addImportFromModule(SMITHY_DAFNY_STD_LIB_GO, "Wrappers"); var nilCheck = ""; if (this.isOptional) { diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/UnionGenerator.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/UnionGenerator.java index 8edcc43c65..328743d0b2 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/UnionGenerator.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/UnionGenerator.java @@ -49,11 +49,13 @@ public void generateUnion(GoWriter writer) { .values() .stream() .filter(memberShape -> !isEventStreamErrorMember(memberShape)) + .sorted() .collect(Collectors.toCollection(TreeSet::new)); memberShapes .stream() .map(symbolProvider::toMemberName) + .sorted() .forEach(name -> { writer.write("// " + name); }); diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java index 60b17ca33f..376077c6bd 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; import software.amazon.polymorph.smithygo.localservice.nameresolver.SmithyNameResolver; @@ -45,9 +46,9 @@ public class ValidationGenerator { } """; private static final Map validationFuncMap = - new HashMap<>(); + new LinkedHashMap<>(); private static final Map validationFuncInputTypeMap = - new HashMap<>(); + new LinkedHashMap<>(); public ValidationGenerator( final GenerationContext context, diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoUsageIndex.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoUsageIndex.java index 8bd7b5226f..c95beb32db 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoUsageIndex.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoUsageIndex.java @@ -71,6 +71,7 @@ public GoUsageIndex(Model model) { ) .stream() .map(Shape::toShapeId) + .sorted() .collect(Collectors.toList()) ); @@ -84,6 +85,7 @@ public GoUsageIndex(Model model) { ) .stream() .map(Shape::toShapeId) + .sorted() .collect(Collectors.toList()) ); }); diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoValidationIndex.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoValidationIndex.java index c4410f6eca..5d2bace7d6 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoValidationIndex.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/knowledge/GoValidationIndex.java @@ -142,6 +142,7 @@ public GoValidationIndex(Model model) { .values() .stream() .map(OperationShape::toShapeId) + .sorted() .collect(Collectors.toSet()) ) ); diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceGenerator.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceGenerator.java index c8f42f114b..191a740745 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceGenerator.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceGenerator.java @@ -5,7 +5,10 @@ import static software.amazon.polymorph.smithygo.codegen.SymbolUtils.POINTABLE; import static software.amazon.polymorph.smithygo.utils.Constants.DAFNY_RUNTIME_GO_LIBRARY_MODULE; +import static software.amazon.polymorph.smithygo.utils.Constants.SMITHY_DAFNY_STD_LIB_GO; +import java.util.LinkedHashSet; +import java.util.stream.Collectors; import software.amazon.polymorph.smithygo.codegen.GenerationContext; import software.amazon.polymorph.smithygo.codegen.GoDelegator; import software.amazon.polymorph.smithygo.codegen.GoWriter; @@ -28,10 +31,8 @@ import software.amazon.smithy.model.shapes.OperationShape; import software.amazon.smithy.model.shapes.ResourceShape; import software.amazon.smithy.model.shapes.ServiceShape; -import software.amazon.smithy.model.shapes.Shape; import software.amazon.smithy.model.traits.ErrorTrait; import software.amazon.smithy.model.traits.UnitTypeTrait; -import software.amazon.smithy.utils.StringUtils; public class DafnyLocalServiceGenerator implements Runnable { @@ -90,6 +91,7 @@ void generateClient(GoWriter writer) { .getNamespace() .equals(service.getId().getNamespace()) ) + .sorted() .forEach(unionShape -> { new UnionGenerator(model, symbolProvider, unionShape) .generateUnion(writer1); @@ -403,10 +405,7 @@ void generateShim() { ), DafnyNameResolver.dafnyTypesNamespace(service) ); - writer.addImportFromModule( - "github.com/dafny-lang/DafnyStandardLibGo", - "Wrappers" - ); + writer.addImportFromModule(SMITHY_DAFNY_STD_LIB_GO, "Wrappers"); writer.addImportFromModule( SmithyNameResolver.getGoModuleNameForSmithyNamespace( context.settings().getService().getNamespace() @@ -623,7 +622,11 @@ void generateShim() { } void shimErrors(GoWriter writer) { - for (final var error : model.getShapesWithTrait(ErrorTrait.class)) { + for (final var error : model + .getShapesWithTrait(ErrorTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new))) { writer.write( """ case $L.$L: @@ -641,7 +644,11 @@ void shimErrors(GoWriter writer) { } void resourceErrors(GoWriter writer) { - for (final var error : model.getShapesWithTrait(ErrorTrait.class)) { + for (final var error : model + .getShapesWithTrait(ErrorTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new))) { writer.write( """ case $L: @@ -710,7 +717,11 @@ void generateUnmodelledErrors(GenerationContext context) { } void generateReferencedResources(final GenerationContext context) { - final var refResources = model.getShapesWithTrait(ReferenceTrait.class); + final var refResources = model + .getShapesWithTrait(ReferenceTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); for (final var refResource : refResources) { if (!refResource.expectTrait(ReferenceTrait.class).isService()) { final var resource = refResource @@ -1019,10 +1030,7 @@ void generateNativeResourceWrapper( context.settings().getModuleName(), SmithyNameResolver.smithyTypesNamespace(service) ); - writer.addImportFromModule( - "github.com/dafny-lang/DafnyStandardLibGo", - "Wrappers" - ); + writer.addImportFromModule(SMITHY_DAFNY_STD_LIB_GO, "Wrappers"); writer.addImportFromModule( SmithyNameResolver.getGoModuleNameForSmithyNamespace( resourceShape.toShapeId().getNamespace() diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java index 8aa36009e2..f8f096d50d 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.Set; import java.util.stream.Collectors; @@ -65,6 +66,8 @@ public void generateSerializers(final GenerationContext context) { final var writerDelegator = context.writerDelegator(); serviceShape .getOperations() + .stream() + .sorted() .forEach(eachOperation -> { final var operation = model.expectShape( eachOperation, @@ -203,7 +206,10 @@ public void generateSerializers(final GenerationContext context) { final var refResources = context .model() - .getShapesWithTrait(ReferenceTrait.class); + .getShapesWithTrait(ReferenceTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); for (final var refResource : refResources) { final var resource = refResource .expectTrait(ReferenceTrait.class) @@ -215,6 +221,8 @@ public void generateSerializers(final GenerationContext context) { ); resourceShape .getOperations() + .stream() + .sorted() .forEach(eachOperation -> { final var operation = model.expectShape( eachOperation, @@ -521,6 +529,8 @@ public void generateDeserializers(final GenerationContext context) { serviceShape .getOperations() + .stream() + .sorted() .forEach(eachOperation -> { final var operation = context .model() @@ -674,7 +684,10 @@ public void generateDeserializers(final GenerationContext context) { final var refResources = context .model() - .getShapesWithTrait(ReferenceTrait.class); + .getShapesWithTrait(ReferenceTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); for (final var refResource : refResources) { final var resource = refResource .expectTrait(ReferenceTrait.class) @@ -686,6 +699,8 @@ public void generateDeserializers(final GenerationContext context) { .expectShape(resource, ResourceShape.class); resourceShape .getOperations() + .stream() + .sorted() .forEach(eachOperation -> { final var operation = context .model() @@ -1164,7 +1179,10 @@ private void generateErrorSerializer( final var serviceShape = context.settings().getService(context.model()); final var errorShapes = context .model() - .getShapesWithTrait(ErrorTrait.class); + .getShapesWithTrait(ErrorTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); for (final var errorShape : errorShapes) { if ( @@ -1264,7 +1282,8 @@ func OpaqueError_Input_ToDafny(nativeInput $L.OpaqueError)($L.Error) { .filter(shape -> ModelUtils.isInServiceNamespace(shape.getId(), serviceShape) ) - .collect(Collectors.toSet()); + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); context .writerDelegator() @@ -1520,7 +1539,10 @@ private void generateErrorDeserializer(final GenerationContext context) { final var serviceShape = context.settings().getService(context.model()); final var errorShapes = context .model() - .getShapesWithTrait(ErrorTrait.class); + .getShapesWithTrait(ErrorTrait.class) + .stream() + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); for (final var errorShape : errorShapes) { if ( !errorShape @@ -1645,7 +1667,8 @@ func OpaqueError_Output_FromDafny(dafnyOutput $L.Error)($L.OpaqueError) { .filter(shape -> ModelUtils.isInServiceNamespace(shape.getId(), serviceShape) ) - .collect(Collectors.toSet()); + .sorted() + .collect(Collectors.toCollection(LinkedHashSet::new)); context .writerDelegator() diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/DafnyToSmithyShapeVisitor.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/DafnyToSmithyShapeVisitor.java index c853ee6719..3c50229d2b 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/DafnyToSmithyShapeVisitor.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/DafnyToSmithyShapeVisitor.java @@ -2,7 +2,7 @@ import static software.amazon.polymorph.smithygo.utils.Constants.DAFNY_RUNTIME_GO_LIBRARY_MODULE; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import software.amazon.polymorph.smithygo.codegen.GenerationContext; @@ -52,7 +52,7 @@ public class DafnyToSmithyShapeVisitor extends ShapeVisitor.Default { private final boolean isOptional; //TODO: Ideally this shouldn't be static but with current design we need to access this across instances. private static final Map memberShapeConversionFuncMap = - new HashMap<>(); + new LinkedHashMap<>(); public DafnyToSmithyShapeVisitor( final GenerationContext context, diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/SmithyToDafnyShapeVisitor.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/SmithyToDafnyShapeVisitor.java index 574bd104d8..10bc55e32e 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/SmithyToDafnyShapeVisitor.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/localservice/shapevisitor/SmithyToDafnyShapeVisitor.java @@ -2,8 +2,9 @@ import static software.amazon.polymorph.smithygo.codegen.SymbolUtils.POINTABLE; import static software.amazon.polymorph.smithygo.utils.Constants.DAFNY_RUNTIME_GO_LIBRARY_MODULE; +import static software.amazon.polymorph.smithygo.utils.Constants.SMITHY_DAFNY_STD_LIB_GO; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import software.amazon.polymorph.smithygo.codegen.GenerationContext; @@ -52,7 +53,7 @@ public class SmithyToDafnyShapeVisitor extends ShapeVisitor.Default { protected boolean isPointerType; //TODO: Ideally this shouldn't be static but with current design we need to access this across instances. private static final Map memberShapeConversionFuncMap = - new HashMap<>(); + new LinkedHashMap<>(); public SmithyToDafnyShapeVisitor( final GenerationContext context, @@ -245,10 +246,7 @@ public String structureShape(final StructureShape shape) { return referenceStructureShape(shape); } final var typeConversionMethodBuilder = new StringBuilder(); - writer.addImportFromModule( - "github.com/dafny-lang/DafnyStandardLibGo", - "Wrappers" - ); + writer.addImportFromModule(SMITHY_DAFNY_STD_LIB_GO, "Wrappers"); writer.addImportFromModule( SmithyNameResolver.getGoModuleNameForSmithyNamespace( shape.toShapeId().getNamespace() diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java index 7cdba14965..6b100d2112 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java @@ -10,6 +10,8 @@ public class Constants { public static final String DAFNY_RUNTIME_GO_LIBRARY_MODULE = "github.com/dafny-lang/DafnyRuntimeGo/v4"; + public static final String SMITHY_DAFNY_STD_LIB_GO = + "github.com/aws/aws-cryptographic-material-providers-library/releases/go/smithy-dafny-standard-library"; // TODO: Is it possible to make this function name shorter and in camelCase? /** diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/utils/ModelUtils.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/utils/ModelUtils.java index fcd31bca1b..0b8469b54d 100644 --- a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/utils/ModelUtils.java +++ b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/utils/ModelUtils.java @@ -461,7 +461,6 @@ public static Set> findAllDependentShapesWithPaths( Set> pathsToShapes = new LinkedHashSet<>( new LinkedHashSet<>() ); - Set visited = new HashSet<>(); // Breadth-first search via getDependencyShapeIds final Queue> toTraverse = new LinkedList<>( @@ -470,16 +469,16 @@ public static Set> findAllDependentShapesWithPaths( while (!toTraverse.isEmpty()) { final List currentShapeIdWithPath = toTraverse.remove(); - // to avoid cycles, only keep the first list with a given last element - ShapeId last = currentShapeIdWithPath.get( - currentShapeIdWithPath.size() - 1 - ); - if (visited.add(last) && pathsToShapes.add(currentShapeIdWithPath)) { + if (pathsToShapes.add(currentShapeIdWithPath)) { final Shape currentShape = model.expectShape( currentShapeIdWithPath.get(currentShapeIdWithPath.size() - 1) ); final List> dependencyShapeIdsWithPaths = getDependencyShapeIds(currentShape) + // to avoid cycles, append only those dependencyShapeId which are not already in the path currentShapeIdWithPath + .filter(dependencyShapeId -> + !currentShapeIdWithPath.contains(dependencyShapeId) + ) .map(dependencyShapeId -> Stream .concat(