Merge pull request #297 from dagger/sh-dx

Various DX improvements
This commit is contained in:
Andrea Luzzardi 2021-04-08 19:23:52 -07:00 committed by GitHub
commit de1d20563d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 107 additions and 80 deletions

View File

@ -8,13 +8,21 @@ import (
"dagger.io/dagger"
"dagger.io/dagger/op"
"dagger.io/alpine"
)
// Default image for basic use cases
// FIXME: should just be 'alpine.#Image'.
// referring to '#.up' is a workaround to a dagger engine bug.
// see https://github.com/dagger/dagger/issues/304
#DefaultImage: alpine.#Image.#up
// Run a Docker container
#Container: {
// Container image
image: dagger.#Artifact
image: dagger.#Artifact | *#DefaultImage
// Independently cacheable setup commands
setup: [...string]
@ -86,6 +94,12 @@ import (
}
env: PATH: string | *strings.Join([ for p, v in shell.search if v {p}], ":")
// Export values from the container to the cue configuration
export: *null | {
source: string
format: op.#Export.format
}
#up: [
op.#Load & {from: image},
// Copy volumes with type=copy
@ -122,5 +136,11 @@ import (
op.#Subdir & {
dir: outputDir
},
if export != null {
op.#Export & {
source: export.source
format: export.format
}
},
]
}

View File

@ -3,7 +3,7 @@ package netlify
import (
"dagger.io/dagger"
"dagger.io/alpine"
"dagger.io/dagger/op"
"dagger.io/docker"
)
// A Netlify account
@ -42,94 +42,52 @@ import (
// Logs URL for this deployment
logsUrl: string
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: jq: "=~1.6"
package: curl: "=~7.74"
package: yarn: "=~1.22"
// Deployment container
#deploy: docker.#Container & {
image: alpine.#Image & {
package: {
bash: "=~5.1"
jq: "=~1.6"
curl: "=~7.74"
yarn: "=~1.22"
}
},
op.#Exec & {
args: ["yarn", "global", "add", "netlify-cli@2.47.0"]
},
op.#Exec & {
}
setup: [
"yarn global add netlify-cli@2.47.0",
]
shell: {
path: "/bin/bash"
args: [
"/bin/bash",
"--noprofile",
"--norc",
"-eo",
"pipefail",
"-c",
code,
]
env: {
NETLIFY_SITE_NAME: name
if (create) {
NETLIFY_SITE_CREATE: "1"
}
if customDomain != _|_ {
NETLIFY_DOMAIN: customDomain
}
NETLIFY_ACCOUNT: account.name
NETLIFY_AUTH_TOKEN: account.token
}
dir: "/src"
volume: "contents": {
dest: "/src"
from: contents
}
env: {
NETLIFY_SITE_NAME: name
if (create) {
NETLIFY_SITE_CREATE: "1"
}
dir: "/src"
mount: "/src": from: contents
},
op.#Export & {
if customDomain != _|_ {
NETLIFY_DOMAIN: customDomain
}
NETLIFY_ACCOUNT: account.name
NETLIFY_AUTH_TOKEN: account.token
}
export: {
source: "/output.json"
format: "json"
},
]
}
// FIXME: this should be outside
let code = #"""
create_site() {
url="https://api.netlify.com/api/v1/${NETLIFY_ACCOUNT:-}/sites"
response=$(curl -s -S -f -H "Authorization: Bearer $NETLIFY_AUTH_TOKEN" \
-X POST -H "Content-Type: application/json" \
$url \
-d "{\"name\": \"${NETLIFY_SITE_NAME}\", \"custom_domain\": \"${NETLIFY_DOMAIN}\"}"
)
if [ $? -ne 0 ]; then
exit 1
fi
echo $response | jq -r '.site_id'
}
}
site_id=$(curl -s -S -f -H "Authorization: Bearer $NETLIFY_AUTH_TOKEN" \
https://api.netlify.com/api/v1/sites\?filter\=all | \
jq -r ".[] | select(.name==\"$NETLIFY_SITE_NAME\") | .id" \
)
if [ -z "$site_id" ] ; then
if [ "${NETLIFY_SITE_CREATE:-}" != 1 ]; then
echo "Site $NETLIFY_SITE_NAME does not exist"
exit 1
fi
site_id=$(create_site)
if [ -z "$site_id" ]; then
echo "create site failed"
exit 1
fi
fi
netlify deploy \
--dir="$(pwd)" \
--site="$site_id" \
--prod \
| tee /tmp/stdout
url=$(</tmp/stdout sed -n -e 's/^Website URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
deployUrl=$(</tmp/stdout sed -n -e 's/^Unique Deploy URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
logsUrl=$(</tmp/stdout sed -n -e 's/^Logs:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
jq -n \
--arg url "$url" \
--arg deployUrl "$deployUrl" \
--arg logsUrl "$logsUrl" \
'{url: $url, deployUrl: $deployUrl, logsUrl: $logsUrl}' > /output.json
"""#
// FIXME: this is a hack to use docker.#Container while exporting
// values.
#up: #deploy.#up
}

View File

@ -0,0 +1,49 @@
package netlify
#Site: #deploy: command: #"""
create_site() {
url="https://api.netlify.com/api/v1/${NETLIFY_ACCOUNT:-}/sites"
response=$(curl -s -S -f -H "Authorization: Bearer $NETLIFY_AUTH_TOKEN" \
-X POST -H "Content-Type: application/json" \
$url \
-d "{\"name\": \"${NETLIFY_SITE_NAME}\", \"custom_domain\": \"${NETLIFY_DOMAIN}\"}"
)
if [ $? -ne 0 ]; then
exit 1
fi
echo $response | jq -r '.site_id'
}
site_id=$(curl -s -S -f -H "Authorization: Bearer $NETLIFY_AUTH_TOKEN" \
https://api.netlify.com/api/v1/sites\?filter\=all | \
jq -r ".[] | select(.name==\"$NETLIFY_SITE_NAME\") | .id" \
)
if [ -z "$site_id" ] ; then
if [ "${NETLIFY_SITE_CREATE:-}" != 1 ]; then
echo "Site $NETLIFY_SITE_NAME does not exist"
exit 1
fi
site_id=$(create_site)
if [ -z "$site_id" ]; then
echo "create site failed"
exit 1
fi
fi
netlify deploy \
--dir="$(pwd)" \
--site="$site_id" \
--prod \
| tee /tmp/stdout
url=$(</tmp/stdout sed -n -e 's/^Website URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
deployUrl=$(</tmp/stdout sed -n -e 's/^Unique Deploy URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
logsUrl=$(</tmp/stdout sed -n -e 's/^Logs:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
jq -n \
--arg url "$url" \
--arg deployUrl "$deployUrl" \
--arg logsUrl "$logsUrl" \
'{url: $url, deployUrl: $deployUrl, logsUrl: $logsUrl}' > /output.json
"""#