netlify: Europa port
- Fix netlify.#Deploy (there's still FIXMEs) - Externalize the `deploy.sh` script - Add tests - Misc engine fixes for more explicit error messages Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
@@ -131,6 +131,7 @@ import (
|
||||
_exec: engine.#Exec & {
|
||||
args: [cmd.name] + cmd._flatFlags + cmd.args
|
||||
input: _image.rootfs
|
||||
"always": always
|
||||
"mounts": mounts
|
||||
"env": env
|
||||
"workdir": workdir
|
||||
|
@@ -1 +0,0 @@
|
||||
deploy.sh.cue
|
58
pkg/universe.dagger.io/netlify/deploy.sh
Executable file
58
pkg/universe.dagger.io/netlify/deploy.sh
Executable file
@@ -0,0 +1,58 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e -o pipefail
|
||||
|
||||
NETLIFY_AUTH_TOKEN="$(cat /run/secrets/token)"
|
||||
export NETLIFY_AUTH_TOKEN
|
||||
|
||||
create_site() {
|
||||
url="https://api.netlify.com/api/v1/${NETLIFY_ACCOUNT:-}/sites"
|
||||
|
||||
curl -s -S --fail-with-body -H "Authorization: Bearer $NETLIFY_AUTH_TOKEN" \
|
||||
-X POST -H "Content-Type: application/json" \
|
||||
"$url" \
|
||||
-d "{\"name\": \"${NETLIFY_SITE_NAME}\", \"custom_domain\": \"${NETLIFY_DOMAIN}\"}" -o body
|
||||
|
||||
# shellcheck disable=SC2181
|
||||
if [ $? -ne 0 ]; then
|
||||
cat body >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
jq -r '.site_id' body
|
||||
}
|
||||
|
||||
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 link --id "$site_id"
|
||||
netlify build
|
||||
|
||||
netlify deploy \
|
||||
--dir="$(pwd)" \
|
||||
--site="$site_id" \
|
||||
--prod \
|
||||
| tee /tmp/stdout
|
||||
|
||||
url="$(</tmp/stdout grep Website | grep -Eo 'https://[^ >]+' | head -1)"
|
||||
deployUrl="$(</tmp/stdout grep Unique | grep -Eo 'https://[^ >]+' | head -1)"
|
||||
logsUrl="$(</tmp/stdout grep Logs | grep -Eo 'https://[^ >]+' | head -1)"
|
||||
|
||||
# Write output files
|
||||
mkdir -p /netlify
|
||||
echo -n "$url" > /netlify/url
|
||||
echo -n "$deployUrl" > /netlify/deployUrl
|
||||
echo -n "$logsUrl" > /netlify/logsUrl
|
@@ -1,56 +0,0 @@
|
||||
package netlify
|
||||
|
||||
_deployScript: #"""
|
||||
export NETLIFY_AUTH_TOKEN="$(cat /run/secrets/token)"
|
||||
|
||||
create_site() {
|
||||
url="https://api.netlify.com/api/v1/${NETLIFY_ACCOUNT:-}/sites"
|
||||
|
||||
response=$(curl -s -S --fail-with-body -H "Authorization: Bearer $NETLIFY_AUTH_TOKEN" \
|
||||
-X POST -H "Content-Type: application/json" \
|
||||
$url \
|
||||
-d "{\"name\": \"${NETLIFY_SITE_NAME}\", \"custom_domain\": \"${NETLIFY_DOMAIN}\"}" -o body
|
||||
)
|
||||
if [ $? -ne 0 ]; then
|
||||
cat body >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cat body | 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 link --id "$site_id"
|
||||
netlify build
|
||||
|
||||
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')
|
||||
|
||||
# Write output files
|
||||
mkdir -p /netlify
|
||||
printf "$url" > /netlify/url
|
||||
printf "$deployUrl" > /netlify/deployUrl
|
||||
printf "$logsUrl" > /netlify/logsUrl
|
||||
"""#
|
@@ -4,10 +4,10 @@ package netlify
|
||||
|
||||
import (
|
||||
"dagger.io/dagger"
|
||||
"universe.dagger.io/docker"
|
||||
"dagger.io/dagger/engine"
|
||||
|
||||
"universe.dagger.io/alpine"
|
||||
"universe.dagger.io/bash"
|
||||
"universe.dagger.io/docker"
|
||||
)
|
||||
|
||||
// Deploy a site to Netlify
|
||||
@@ -35,30 +35,61 @@ import (
|
||||
// Create the site if it doesn't exist
|
||||
create: *true | false
|
||||
|
||||
// Execute `netlify deploy` in a container
|
||||
command: bash.#Run & {
|
||||
// Container image. `netlify` must be available in the execution path
|
||||
*{
|
||||
_buildDefaultImage: docker.#Build & {
|
||||
input: alpine.#Build & {
|
||||
bash: version: "=~5.1"
|
||||
jq: version: "=~1.6"
|
||||
// Source code of the Netlify package
|
||||
_source: engine.#Source & {
|
||||
path: "."
|
||||
include: ["*.sh"]
|
||||
}
|
||||
|
||||
_build: docker.#Build & {
|
||||
steps: [
|
||||
alpine.#Build & {
|
||||
packages: {
|
||||
bash: {}
|
||||
curl: {}
|
||||
yarn: version: "=~1.22"
|
||||
jq: {}
|
||||
yarn: {}
|
||||
}
|
||||
steps: [{
|
||||
run: script: "yarn global add netlify-cli@3.38.10"
|
||||
}]
|
||||
}
|
||||
},
|
||||
docker.#Run & {
|
||||
cmd: {
|
||||
name: "yarn"
|
||||
args: ["global", "add", "netlify-cli@8.6.21"]
|
||||
}
|
||||
},
|
||||
docker.#Copy & {
|
||||
contents: _source.output
|
||||
dest: "/app"
|
||||
},
|
||||
]
|
||||
}
|
||||
|
||||
// No nested tasks, boo hoo hoo
|
||||
image: _buildDefaultImage.output
|
||||
env: CUSTOM_IMAGE: "0"
|
||||
} | {
|
||||
env: CUSTOM_IMAGE: "1"
|
||||
}
|
||||
// Execute `netlify deploy` in a container
|
||||
command: docker.#Run & {
|
||||
// FIXME: custom base image not supported
|
||||
// Container image. `netlify` must be available in the execution path
|
||||
// *{
|
||||
// _buildDefaultImage: docker.#Build & {
|
||||
// input: alpine.#Build & {
|
||||
// bash: version: "=~5.1"
|
||||
// jq: version: "=~1.6"
|
||||
// curl: {}
|
||||
// yarn: version: "=~1.22"
|
||||
// }
|
||||
// steps: [{
|
||||
// run: script: "yarn global add netlify-cli@3.38.10"
|
||||
// }]
|
||||
// }
|
||||
|
||||
// // No nested tasks, boo hoo hoo
|
||||
// image: _buildDefaultImage.output
|
||||
// env: CUSTOM_IMAGE: "0"
|
||||
// } | {
|
||||
// env: CUSTOM_IMAGE: "1"
|
||||
// }
|
||||
|
||||
image: _build.output
|
||||
|
||||
script: _deployScript // see deploy.sh
|
||||
always: true
|
||||
env: {
|
||||
NETLIFY_SITE_NAME: site
|
||||
@@ -81,7 +112,9 @@ import (
|
||||
contents: token
|
||||
}
|
||||
}
|
||||
output: files: {
|
||||
cmd: name: "/app/deploy.sh"
|
||||
|
||||
export: files: {
|
||||
"/netlify/url": _
|
||||
"/netlify/deployUrl": _
|
||||
"/netlify/logsUrl": _
|
||||
@@ -89,11 +122,11 @@ import (
|
||||
}
|
||||
|
||||
// URL of the deployed site
|
||||
url: command.output.files."/netlify/url".contents
|
||||
url: command.export.files."/netlify/url".contents
|
||||
|
||||
// URL of the latest deployment
|
||||
deployUrl: command.output.files."/netlify/deployUrl".contents
|
||||
deployUrl: command.export.files."/netlify/deployUrl".contents
|
||||
|
||||
// URL for logs of the latest deployment
|
||||
logsUrl: command.output.files."/netlify/logsUrl".contents
|
||||
logsUrl: command.export.files."/netlify/logsUrl".contents
|
||||
}
|
||||
|
61
pkg/universe.dagger.io/netlify/test/netlify-test.cue
Normal file
61
pkg/universe.dagger.io/netlify/test/netlify-test.cue
Normal file
@@ -0,0 +1,61 @@
|
||||
package yarn
|
||||
|
||||
import (
|
||||
"encoding/yaml"
|
||||
|
||||
"dagger.io/dagger"
|
||||
"dagger.io/dagger/engine"
|
||||
|
||||
"universe.dagger.io/netlify"
|
||||
"universe.dagger.io/alpine"
|
||||
"universe.dagger.io/bash"
|
||||
)
|
||||
|
||||
dagger.#Plan & {
|
||||
inputs: secrets: test: command: {
|
||||
name: "sops"
|
||||
args: ["-d", "../../test_secrets.yaml"]
|
||||
}
|
||||
|
||||
actions: {
|
||||
testSecrets: engine.#TransformSecret & {
|
||||
input: inputs.secrets.test.contents
|
||||
#function: {
|
||||
input: _
|
||||
output: yaml.Unmarshal(input)
|
||||
}
|
||||
}
|
||||
|
||||
marker: "hello world"
|
||||
|
||||
data: engine.#WriteFile & {
|
||||
input: engine.#Scratch
|
||||
path: "index.html"
|
||||
contents: marker
|
||||
}
|
||||
|
||||
// Deploy to netlify
|
||||
deploy: netlify.#Deploy & {
|
||||
team: "blocklayer"
|
||||
token: testSecrets.output.netlifyToken.contents
|
||||
|
||||
site: "dagger-test"
|
||||
contents: data.output
|
||||
}
|
||||
|
||||
_alpine: alpine.#Build & {
|
||||
packages: {
|
||||
bash: {}
|
||||
curl: {}
|
||||
}
|
||||
}
|
||||
|
||||
// Check if the website was deployed
|
||||
verify: bash.#Run & {
|
||||
input: _alpine.output
|
||||
script: #"""
|
||||
test "$(curl \#(deploy.deployUrl))" = "\#(marker)"
|
||||
"""#
|
||||
}
|
||||
}
|
||||
}
|
9
pkg/universe.dagger.io/netlify/test/netlify.bats
Normal file
9
pkg/universe.dagger.io/netlify/test/netlify.bats
Normal file
@@ -0,0 +1,9 @@
|
||||
setup() {
|
||||
load '../../bats_helpers'
|
||||
|
||||
common_setup
|
||||
}
|
||||
|
||||
@test "netlify.#Deploy" {
|
||||
dagger up ./netlify-test.cue
|
||||
}
|
@@ -1,9 +0,0 @@
|
||||
package netlify
|
||||
|
||||
import (
|
||||
"dagger.io/dagger"
|
||||
)
|
||||
|
||||
deploy: #Deploy & {
|
||||
contents: dagger.#Scratch
|
||||
}
|
21
pkg/universe.dagger.io/test_secrets.yaml
Normal file
21
pkg/universe.dagger.io/test_secrets.yaml
Normal file
@@ -0,0 +1,21 @@
|
||||
netlifyToken: ENC[AES256_GCM,data:DeTBgf73iiIDVJZ3i1Rd6Cn9KvJGwh7n8/u/zWKdpaMvU7R1X43JqMbZMg==,iv:0HmdJr7BHKQk+RrCWAzZCkU7BkJ5N5//otgwAgJnQ6w=,tag:DoVYsCnO6HMHXpakX4uBlA==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1gxwmtwahzwdmrskhf90ppwlnze30lgpm056kuesrxzeuyclrwvpsupwtpk
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnUEhWbjV3M29oUUJyWk81
|
||||
Wk1WQ1E0cmtuVlhNSGxkWUM3WmJXdUYvbzAwCjlFWW9IVmtmTjY1aU1LR2lxWFlT
|
||||
am9RemNqSDRWK2FDYk1xeGNiTFlWMFUKLS0tIFVrSzBCMERQbnhYb09ReVpFK00v
|
||||
TG5YUDlFVzlRRFBCdEhsNVlVK1dMRTgKx1TPZWWQiaU8iMni03/ekG+m4rFCcaa4
|
||||
JI+ED2d+8411BgZtlss/ukQtwskidvYTvetyWw2jes6o1lhfDv5q2A==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2022-01-20T00:42:44Z"
|
||||
mac: ENC[AES256_GCM,data:N4dbowNmz34Hn/o1Ofv4g9Z5I7EzcYyrGpXSu9fkczd69zkTpv87uFamEdV/kQM2bbIEm9gS8d0oTi41qsC0iax368YUJmjG6xMptwrrA/mcjRzwXjlPrCZN9454srJw4NXWm0F5/aJQa4XlO65OCLZw+4WCz0wyAWwKzuQNAb0=,iv:EIG55jdEIbVp390uCVJ/rCjJO+s+CsAblH0/CIMNgIc=,tag:dcZDoMsBToikTQ83R0azag==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.7.1
|
Reference in New Issue
Block a user