Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(updatecli): update updatecli manifests to use the new goss-common.yaml file #989

Merged
merged 6 commits into from
Jan 15, 2024
Merged

chore(updatecli): update updatecli manifests to use the new goss-common.yaml file #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8997bff
correct useless v
smerle33 Jan 15, 2024
5e040ae
use correct github new path for jq
smerle33 Jan 15, 2024
88bb301
re-enable updatecli for jq
smerle33 Jan 15, 2024
1748b76
migrate updatecli manifests to new goss-common.yaml
smerle33 Jan 15, 2024
490154e
re enable netlifydeploy updatecli
smerle33 Jan 15, 2024
877d3ed
Merge branch 'main' into updatecli/goss/split
smerle33 Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions goss/goss-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ command:
chromium-browser:
exec: chromium-browser --version
exit-status: 0
container-structure-test:
exec: container-structure-test version
exit-status: 0
stdout:
- 1.16.0
datadog-agent:
exec: datadog-agent version
exit-status: 0
Expand Down
2 changes: 1 addition & 1 deletion provisioning/windows-provision.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ $downloads = [ordered]@{
'cleanupLocal' = 'true';
};
'jq' = @{
'url' = 'https://github.com/stedolan/jq/releases/download/jq-{0}/jq-win64.exe' -f $env:JQ_VERSION;
'url' = 'https://github.com/jqlang/jq/releases/download/jq-{0}/jq-win64.exe' -f $env:JQ_VERSION;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add something about this change in the PR body.

Was it required for this PR or could it have been its own?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's to be compliant with this change updatecli/updatecli.d/jq.yml on the same PR, the new name is jqlang and seems better to use than the oldone stedolan that is forwarded to jqlang

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation. I still would add a mention of this change in the PR body 😉

'local' = "$baseDir\jq.exe"
};
'az' = @{
Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/awscli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.awscli.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/azure-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.azurecli.stdout[0]
scmid: default

Expand Down
5 changes: 1 addition & 4 deletions updatecli/updatecli.d/container-structure-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,8 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.container-structure-test.stdout[0]
transformers:
- addprefix: "v"
scmid: default

actions:
Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.docker_compose.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/git-lfs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.git_lfs.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/github-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.gh_cli.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/goss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.goss.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/hadolint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.hadolint.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/jdk11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.default_java.stdout[0]
scmid: default

Expand Down
14 changes: 10 additions & 4 deletions updatecli/updatecli.d/jq.yml.disabled → updatecli/updatecli.d/jq.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,24 @@ sources:
kind: githubrelease
name: Get the latest jq release version
spec:
owner: "stedolan"
owner: "jqlang"
repository: "jq"
token: "{{ requiredEnv .github.token }}"
username: "{{ .github.username }}"
versionfilter:
kind: regex
## Latest stable x.y.z version
pattern: 'jq-(\d*)\.(\d*)$'
pattern: 'jq-(\d*)\.(\d*)\.(\d*)$'
transformers:
- trimprefix: "jq-"

conditions:
checkwindowsversion:
disablesourceinput: true
kind: shell
spec:
command: curl --connect-timeout 5 --verbose --silent --show-error --location --fail --head --output /dev/null "https://github.com/jqlang/jq/releases/download/jq-{{ source "lastReleaseVersion" }}/jq-win64.exe"

targets:
updateVersion:
name: "Update the jq version in the tools-versions.yml file"
Expand All @@ -43,8 +50,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.jq.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/jx-release-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.jx-release-version.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/launchable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.launchable.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.nodejs.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/packer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.packer.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/terraform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.terraform.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/trivy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.trivy.stdout[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/updatecli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.updatecli.stderr[0]
scmid: default

Expand Down
3 changes: 1 addition & 2 deletions updatecli/updatecli.d/yq.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ targets:
kind: yaml
spec:
files:
- goss/goss-linux.yaml
- goss/goss-windows.yaml
- goss/goss-common.yaml
key: $.command.yq.stdout[0]
scmid: default

Expand Down