Merge pull request #761 from grouville/aws_force_dependency_tests
aws: force dependency between deploy and verify
This commit is contained in:
commit
535bbb68fb
@ -3,6 +3,7 @@ package s3
|
||||
import (
|
||||
"alpha.dagger.io/dagger"
|
||||
"alpha.dagger.io/aws"
|
||||
"alpha.dagger.io/random"
|
||||
)
|
||||
|
||||
TestConfig: awsConfig: aws.#Config & {
|
||||
@ -16,22 +17,30 @@ content: "A simple test sentence"
|
||||
TestDirectory: dagger.#Artifact
|
||||
|
||||
TestS3Object: {
|
||||
suffix: random.#String & {
|
||||
seed: "s3"
|
||||
}
|
||||
|
||||
target: "s3://\(bucket)/\(suffix.out)/"
|
||||
|
||||
deploy: #Object & {
|
||||
always: true
|
||||
config: TestConfig.awsConfig
|
||||
source: TestDirectory
|
||||
target: "s3://\(bucket)/"
|
||||
"target": target
|
||||
}
|
||||
|
||||
verifyFile: #VerifyS3 & {
|
||||
config: TestConfig.awsConfig
|
||||
target: deploy.target
|
||||
url: deploy.url
|
||||
file: "dirFile.txt"
|
||||
}
|
||||
|
||||
verifyDir: #VerifyS3 & {
|
||||
config: TestConfig.awsConfig
|
||||
target: deploy.target
|
||||
url: deploy.url
|
||||
file: "foo.txt"
|
||||
}
|
||||
}
|
||||
|
@ -11,7 +11,10 @@ import (
|
||||
config: aws.#Config
|
||||
|
||||
// Target S3 URL (e.g. s3://<bucket-name>/<path>/<sub-path>)
|
||||
target?: string
|
||||
target: string
|
||||
|
||||
// URL: dummy URL, used to force a dependency
|
||||
url: string
|
||||
|
||||
contents: {
|
||||
string
|
||||
@ -35,6 +38,7 @@ import (
|
||||
aws s3 ls --recursive \#(target) > /contents
|
||||
"""#,
|
||||
]
|
||||
env: URL: url
|
||||
},
|
||||
|
||||
op.#Export & {
|
||||
@ -49,10 +53,12 @@ import (
|
||||
file: string
|
||||
config: aws.#Config
|
||||
target: string
|
||||
url: string
|
||||
|
||||
lists: #List & {
|
||||
"config": config
|
||||
"target": target
|
||||
"url": url
|
||||
}
|
||||
|
||||
test: #up: [
|
||||
|
Reference in New Issue
Block a user