From 4a8aed6354f1085a89ed0428aa70f4131e1e63f7 Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Fri, 10 Jan 2025 10:14:04 +0100 Subject: [PATCH 01/10] Move caution section after summary --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 759d8c7..b00938b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -> [!CAUTION] -> ## This project is owned by the Upsun Advocacy team. It is in early stage of development [experimental] and only intended to be used with caution by Upsun customers/community.

This project is not supported by Upsun and does not qualify for Support plans. Use this repository at your own risks, it is provided without guarantee or warranty! -> Don’t hesitate to join our [Discord](https://discord.com/invite/platformsh) to share your thoughts about this project. - - ConvSun ========= This CLI-tool uses **Platform.sh** config files *(routes.yaml, services.yaml and .platform.app.yaml(s)/applications.yaml)* to generate the **Upsun** config file *(config.yaml)* + +> [!CAUTION] +> **This project is owned by the Upsun Advocacy team. It is in early stage of development [experimental] and only intended to be used with caution by Upsun customers/community.

This project is not supported by Upsun and does not qualify for Support plans. Use this repository at your own risks, it is provided without guarantee or warranty!** +> Don’t hesitate to join our [Discord](https://discord.com/invite/platformsh) to share your thoughts about this project. + > **WARNING : This tool handles classic 'multi-app...' cases but has not been tested for snowflack cases.** #### Install From eebe35c34821410e5c8832452d51a33c547c9571 Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Wed, 29 Jan 2025 14:45:15 +0100 Subject: [PATCH 02/10] Update lib for Fix #3 & Fix #5 --- README.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b00938b..d63ee82 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,4 @@ Usage of convsun: ``` #### Sample -`$ upsun_convert --src=tests/convert"` +`$ convsun --src=tests/convert"` diff --git a/go.mod b/go.mod index dd116a4..1797537 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.6 require ( github.com/spf13/pflag v1.0.5 - github.com/upsun/lib-sun v0.3.13 + github.com/upsun/lib-sun v0.3.14 ) require ( diff --git a/go.sum b/go.sum index 4f100c7..7b0f1c8 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/upsun/lib-sun v0.3.13 h1:gB40P4XBeu/sMrEGASCZ+vuf1m4Xy13ndAGAPECy/Tw= -github.com/upsun/lib-sun v0.3.13/go.mod h1:8AtRNv0L+c9qCS/maO/OVFIn2VDi89LTkWwpB7YKTDE= +github.com/upsun/lib-sun v0.3.14 h1:qD36j2bPMbGMmDH7Gu8lI8KZtTt+HnmeO/O/kRZ08ec= +github.com/upsun/lib-sun v0.3.14/go.mod h1:8AtRNv0L+c9qCS/maO/OVFIn2VDi89LTkWwpB7YKTDE= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= From fd80b18cafb4fd08daaaaef396e38da5c36763a7 Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Mon, 10 Feb 2025 12:44:04 +0100 Subject: [PATCH 03/10] Update libraries --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1797537..9492b92 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/upsun/convsun -go 1.22.6 +go 1.23.5 require ( github.com/spf13/pflag v1.0.5 From 3575d760302a4752146a4b26bb38a92f58c0b10c Mon Sep 17 00:00:00 2001 From: Guillaume Moigneu Date: Mon, 14 Apr 2025 09:42:14 -0500 Subject: [PATCH 04/10] Update README.md with a few typo fixes --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d63ee82..0eab09a 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,15 @@ ConvSun This CLI-tool uses **Platform.sh** config files *(routes.yaml, services.yaml and .platform.app.yaml(s)/applications.yaml)* to generate the **Upsun** config file *(config.yaml)* > [!CAUTION] -> **This project is owned by the Upsun Advocacy team. It is in early stage of development [experimental] and only intended to be used with caution by Upsun customers/community.

This project is not supported by Upsun and does not qualify for Support plans. Use this repository at your own risks, it is provided without guarantee or warranty!** +> **This project is owned by the Upsun Advocacy team. It is in the early stage of development [experimental] and only intended to be used with caution by Upsun customers/community.

This project is not supported by Upsun and does not qualify for Support plans. Use this repository at your own risk, it is provided without guarantee or warranty!** > Don’t hesitate to join our [Discord](https://discord.com/invite/platformsh) to share your thoughts about this project. -> **WARNING : This tool handles classic 'multi-app...' cases but has not been tested for snowflack cases.** +> **WARNING: This tool handles classic 'multi-app...' cases but has not been tested for snowflake cases.** #### Install Download the last binary in [release section](https://github.com/upsun/convsun/releases). -Extract it and enjoy ! +Extract it and enjoy! #### Syntax ``` From 8d6c54335754c7e874600b8c3394e9de798f1046 Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Tue, 22 Apr 2025 12:09:08 +0200 Subject: [PATCH 05/10] Remove private repository (SEC-587) --- .github/workflows/build.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f53c51b..179d378 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,10 +24,6 @@ jobs: with: go-version: '1.22' check-latest: true - - name: Run config private repo - env: - TOKEN: ${{ secrets.MICK_GITHUB_TOKEN }} - run: git config --global url."https://user:${TOKEN}@github.com".insteadOf https://github.com - name: Run Go Format run: gofmt -s -w . && git diff --exit-code - name: Run Go Tidy @@ -47,10 +43,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 - - name: Run config private repo - env: - TOKEN: ${{ secrets.MICK_GITHUB_TOKEN }} - run: git config --global url."https://user:${TOKEN}@github.com".insteadOf https://github.com - name: Run tests run: go test -v -count=1 -race -shuffle=on -coverprofile=coverage.txt ./... - name: Go Benchmark @@ -83,10 +75,5 @@ jobs: - uses: actions/setup-go@v4 with: go-version: '1.22' - - name: Run config private repo - env: - TOKEN: ${{ secrets.MICK_GITHUB_TOKEN }} - run: git config --global url."https://user:${TOKEN}@github.com".insteadOf https://github.com - - name: Build run: GOARCH=${{ matrix.goarch }} GOOS=${{ matrix.goos }} go build -v ./... From 7b9d15a7976a205c657bf43308496004ed4d7bab Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Tue, 22 Apr 2025 12:14:20 +0200 Subject: [PATCH 06/10] Enabled GH action on all PR --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 179d378..0045f2a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -4,7 +4,6 @@ on: push: branches: [ "master" ] pull_request: - branches: [ "master" ] schedule: - cron: '0 10 * * 1' # run "At 10:00 on Monday" From 97914dafb3ee398f02c5204b67bc1758a7924cb7 Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Tue, 22 Apr 2025 12:25:46 +0200 Subject: [PATCH 07/10] Change on trigger --- .github/workflows/build.yaml | 5 ----- .github/workflows/release.yaml | 7 ------- 2 files changed, 12 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0045f2a..e5cf930 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,17 +2,12 @@ name: Build on: push: - branches: [ "master" ] - pull_request: schedule: - cron: '0 10 * * 1' # run "At 10:00 on Monday" permissions: contents: read -env: - GOPRIVATE: github.com/upsun/lib-sun,github.com/upsun/convsun - jobs: lint: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8875a41..f5b2823 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,13 +24,6 @@ jobs: - uses: actions/checkout@v4 - uses: wangyoucao577/go-release-action@v1 with: - pre_command: | - echo "machine github.com login ${{ github.actor }} password ${{ secrets.MICK_GITHUB_TOKEN }}" > ~/.netrc - chmod 600 ~/.netrc - git config --global --add url."https://github.com/".insteadOf "ssh://git@github.com/" - git config --global --add url."https://github.com/".insteadOf "git@github.com" - go env -w GOPRIVATE=github.com/upsun/* - github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} project_path: "./cmd/" From 0f2731e63b2e0e5252a16df659d62cca1671ea69 Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Tue, 22 Apr 2025 12:35:37 +0200 Subject: [PATCH 08/10] Upgrade Go version for GH action --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e5cf930..e5794c9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: '1.22' + go-version: '1.23' check-latest: true - name: Run Go Format run: gofmt -s -w . && git diff --exit-code @@ -68,6 +68,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: '1.22' + go-version: '1.23' - name: Build run: GOARCH=${{ matrix.goarch }} GOOS=${{ matrix.goos }} go build -v ./... From 31d0ef93ef987faede0c328d602b4072d15df1ab Mon Sep 17 00:00:00 2001 From: Mickael Gaillard Date: Wed, 23 Apr 2025 17:19:43 +0200 Subject: [PATCH 09/10] Fix bad remove --- .github/workflows/build.yaml | 3 +++ .github/workflows/release.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e5794c9..78fb752 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,6 +2,9 @@ name: Build on: push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] schedule: - cron: '0 10 * * 1' # run "At 10:00 on Monday" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f5b2823..807e08f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,6 +24,7 @@ jobs: - uses: actions/checkout@v4 - uses: wangyoucao577/go-release-action@v1 with: + github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} project_path: "./cmd/" From 7d9d0c5d968eeb6d173a541a411dda16e5ca652e Mon Sep 17 00:00:00 2001 From: NDuncan Date: Tue, 23 Sep 2025 14:58:52 +0200 Subject: [PATCH 10/10] updating Discord link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b00938b..b30719e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This CLI-tool uses **Platform.sh** config files *(routes.yaml, services.yaml and > [!CAUTION] > **This project is owned by the Upsun Advocacy team. It is in early stage of development [experimental] and only intended to be used with caution by Upsun customers/community.

This project is not supported by Upsun and does not qualify for Support plans. Use this repository at your own risks, it is provided without guarantee or warranty!** -> Don’t hesitate to join our [Discord](https://discord.com/invite/platformsh) to share your thoughts about this project. +> Don’t hesitate to join our [Discord](https://discord.gg/upsun) to share your thoughts about this project. > **WARNING : This tool handles classic 'multi-app...' cases but has not been tested for snowflack cases.**