From 61ad34ca2afa1e521a1cdffb0e1a9be1d0166d14 Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 18 Jun 2024 16:30:08 +0000 Subject: [PATCH 1/5] fix dmsghttp update command --- cmd/skywire-cli/commands/config/dmsghttp.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/skywire-cli/commands/config/dmsghttp.go b/cmd/skywire-cli/commands/config/dmsghttp.go index 17bd2c698..4bd97f3f5 100644 --- a/cmd/skywire-cli/commands/config/dmsghttp.go +++ b/cmd/skywire-cli/commands/config/dmsghttp.go @@ -16,17 +16,19 @@ import ( "github.com/skycoin/skywire-utilities/pkg/skyenv" ) +var dmsghttpPath string + func init() { updateCmd.AddCommand(dmsghttpCmd) dmsghttpCmd.Flags().SortFlags = false //TODO: fix path for non linux package defaults - dmsghttpCmd.Flags().StringVarP(&path, "path", "p", "/opt/skywire/dmsghttp-config.json", "path of dmsghttp-config file, default is for pkg installation") + dmsghttpCmd.Flags().StringVarP(&dmsghttpPath, "path", "p", "/opt/skywire/dmsghttp-config.json", "path of dmsghttp-config file, default is for pkg installation") } var dmsghttpCmd = &cobra.Command{ Use: "dmsghttp", Short: "update dmsghttp-config.json file from config bootstrap service", - Run: func(cmd *cobra.Command, args []string) { + Run: func(cmd *cobra.Command, args []string) { //nolint log := logging.MustGetLogger("dmsghttp_updater") ctx, cancel := cmdutil.SignalContext(context.Background(), log) @@ -36,7 +38,6 @@ var dmsghttpCmd = &cobra.Command{ cancel() os.Exit(1) }() - dmsghttpConf, err := fetchDmsghttpConf() if err != nil { log.WithError(err).Error("Cannot fetching updated dmsghttp-config data") @@ -47,9 +48,9 @@ var dmsghttpCmd = &cobra.Command{ log.WithError(err).Error("Error accurs during marshal content to json file") } - err = os.WriteFile(path, file, 0600) + err = os.WriteFile(dmsghttpPath, file, 0600) if err != nil { - log.WithError(err).Errorf("Cannot save new dmsghttp-config.json file at %s", path) + log.WithError(err).Errorf("Cannot save new dmsghttp-config.json file at %s", dmsghttpPath) } }, } From 74229a289ee7a39f50514488d90e0bb2c2694a90 Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 18 Jun 2024 16:32:53 +0000 Subject: [PATCH 2/5] add dmsghttp-update command to Makefile --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 4ce0cb181..6fa72192c 100644 --- a/Makefile +++ b/Makefile @@ -358,6 +358,10 @@ windows-installer-release: gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./skywire-installer-${GITHUB_TAG}-windows-amd64.msi gh release upload --repo skycoin/skywire ${GITHUB_TAG} ./skywire-installer-${GITHUB_TAG}-windows-386.msi +# useful commands +dmsghttp-update: ## update dmsghttp config + go run cmd/skywire/skywire.go cli config update dmsghttp -p dmsghttp-config.json + help: ## `make help` menu @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' From 6fee61b24944c303a76b0a8ece983216ddcea4d8 Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 18 Jun 2024 16:34:18 +0000 Subject: [PATCH 3/5] update dmsghttp-config.json file --- dmsghttp-config.json | 160 +++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/dmsghttp-config.json b/dmsghttp-config.json index 590a83ccf..59f1d03ea 100644 --- a/dmsghttp-config.json +++ b/dmsghttp-config.json @@ -1,82 +1,82 @@ { - "test": { - "dmsg_servers": [ - { - "static":"024716428e6315d954356e9ad72bea32bb2b41aab5a54a9b5cb4313964016e64d8", - "server":{ - "address":"139.144.183.24:30080" - } - } - ], - "dmsg_discovery": "dmsg://03cd2336e5de74bdab2bbdb44b06b0c8c713a5ee9029615f5526f8c99a6afe87b8:80", - "transport_discovery": "dmsg://02703cf828ea11d25b2c8eb0796132ecc7e53b22325b20ce3674ce5cd8693e4fb6:80", - "address_resolver": "dmsg://030eb7d8cf6eac40c19bbc433de6d6b9bb7a47f2e1d7095c6a01aa676471670ad2:80", - "route_finder": "dmsg://02ece5b69eaee13ef967b7eb67ca93f1dfddad3a51c9cb1808c4bd0d8d8aa32053:80", - "uptime_tracker": "dmsg://022c788cca11f208cdfd83ed0c2a8c7b661221736c461adc7c6738a2c1b041c7f8:80", - "service_discovery": "dmsg://038f751df4af75fb3d51f6693602bfe8289145e633ffdd1e67d686bea595f84d55:80" - }, - "prod": { - "dmsg_servers": [ - { - "static":"02a2d4c346dabd165fd555dfdba4a7f4d18786fe7e055e562397cd5102bdd7f8dd", - "server":{ - "address":"139.144.183.24:30082" - } - }, - { - "static":"03717576ada5b1744e395c66c2bb11cea73b0e23d0dcd54422139b1a7f12e962c4", - "server":{ - "address":"139.144.183.24:30083" - } - }, - { - "static":"0228af3fd99c8d86a882495c8e0202bdd4da78c69e013065d8634286dd4a0ac098", - "server":{ - "address":"192.46.229.112:30084" - } - }, - { - "static":"03d5b55d1133b26485c664cf8b95cff6746d1e321c34e48c9fed293eff0d6d49e5", - "server":{ - "address":"139.177.189.68:30083" - } - }, - { - "static":"0281a102c82820e811368c8d028cf11b1a985043b726b1bcdb8fce89b27384b2cb", - "server":{ - "address":"139.162.160.227:30086" - } - }, - { - "static":"02a49bc0aa1b5b78f638e9189be4ed095bac5d6839c828465a8350f80ac07629c0", - "server":{ - "address":"139.144.183.24:30081" - } - }, - { - "static": "0326978f5a53aff537dbb47fed58b1f123af3b00132d365f1309a14db4168dcff7", - "server": { - "address": "70.121.23.42:9083" - } - }, - { - "static": "0371ab4bcff7b121f4b91f6856d6740c6f9dc1fe716977850aeb5d84378b300a13", - "server": { - "address": "139.162.160.227:30087" - } - }, - { - "static": "030c83534af1041aee60c2f124b682a9d60c6421876db7c67fc83a73c5effdbd96", - "server": { - "address": "188.121.99.59:8081" - } - } - ], - "dmsg_discovery": "dmsg://022e607e0914d6e7ccda7587f95790c09e126bbd506cc476a1eda852325aadd1aa:80", - "transport_discovery": "dmsg://02b307aee5c8ce1666c63891f8af25ad2f0a47a243914c963942b3ba35b9d095ae:80", - "address_resolver": "dmsg://03234b2ee4128d1f78c180d06911102906c80795dfe41bd6253f2619c8b6252a02:80", - "route_finder": "dmsg://039d89c5eedfda4a28b0c58b0b643eff949f08e4f68c8357278081d26f5a592d74:80", - "uptime_tracker": "dmsg://022c424caa6239ba7d1d9d8f7dab56cd5ec6ae2ea9ad97bb94ad4b48f62a540d3f:80", - "service_discovery": "dmsg://0204890f9def4f9a5448c2e824c6a4afc85fd1f877322320898fafdf407cc6fef7:80" - } + "test": { + "dmsg_servers": [ + { + "static": "024716428e6315d954356e9ad72bea32bb2b41aab5a54a9b5cb4313964016e64d8", + "server": { + "address": "139.144.183.24:30080" + } + } + ], + "dmsg_discovery": "024a7b9b7db1626d46777e5c665333afa57f48934b57652305fc7a2b19dc4c65d4:80", + "transport_discovery": "02703cf828ea11d25b2c8eb0796132ecc7e53b22325b20ce3674ce5cd8693e4fb6:80", + "address_resolver": "030eb7d8cf6eac40c19bbc433de6d6b9bb7a47f2e1d7095c6a01aa676471670ad2:80", + "route_finder": "02ece5b69eaee13ef967b7eb67ca93f1dfddad3a51c9cb1808c4bd0d8d8aa32053:80", + "uptime_tracker": "022c788cca11f208cdfd83ed0c2a8c7b661221736c461adc7c6738a2c1b041c7f8:80", + "service_discovery": "038f751df4af75fb3d51f6693602bfe8289145e633ffdd1e67d686bea595f84d55:80" + }, + "prod": { + "dmsg_servers": [ + { + "static": "02a2d4c346dabd165fd555dfdba4a7f4d18786fe7e055e562397cd5102bdd7f8dd", + "server": { + "address": "139.144.183.24:30082" + } + }, + { + "static": "02a49bc0aa1b5b78f638e9189be4ed095bac5d6839c828465a8350f80ac07629c0", + "server": { + "address": "139.144.183.24:30081" + } + }, + { + "static": "03717576ada5b1744e395c66c2bb11cea73b0e23d0dcd54422139b1a7f12e962c4", + "server": { + "address": "139.144.183.24:30083" + } + }, + { + "static": "0228af3fd99c8d86a882495c8e0202bdd4da78c69e013065d8634286dd4a0ac098", + "server": { + "address": "139.162.55.79:30084" + } + }, + { + "static": "03d5b55d1133b26485c664cf8b95cff6746d1e321c34e48c9fed293eff0d6d49e5", + "server": { + "address": "170.187.228.44:30083" + } + }, + { + "static": "0371ab4bcff7b121f4b91f6856d6740c6f9dc1fe716977850aeb5d84378b300a13", + "server": { + "address": "139.162.160.227:30087" + } + }, + { + "static": "030c83534af1041aee60c2f124b682a9d60c6421876db7c67fc83a73c5effdbd96", + "server": { + "address": "188.121.99.59:8081" + } + }, + { + "static": "0326978f5a53aff537dbb47fed58b1f123af3b00132d365f1309a14db4168dcff7", + "server": { + "address": "70.121.23.42:9083" + } + }, + { + "static": "0281a102c82820e811368c8d028cf11b1a985043b726b1bcdb8fce89b27384b2cb", + "server": { + "address": "139.162.160.227:30086" + } + } + ], + "dmsg_discovery": "022e607e0914d6e7ccda7587f95790c09e126bbd506cc476a1eda852325aadd1aa:80", + "transport_discovery": "02b307aee5c8ce1666c63891f8af25ad2f0a47a243914c963942b3ba35b9d095ae:80", + "address_resolver": "03234b2ee4128d1f78c180d06911102906c80795dfe41bd6253f2619c8b6252a02:80", + "route_finder": "039d89c5eedfda4a28b0c58b0b643eff949f08e4f68c8357278081d26f5a592d74:80", + "uptime_tracker": "022c424caa6239ba7d1d9d8f7dab56cd5ec6ae2ea9ad97bb94ad4b48f62a540d3f:80", + "service_discovery": "0204890f9def4f9a5448c2e824c6a4afc85fd1f877322320898fafdf407cc6fef7:80" + } } From bc736e33081cf2e7e9b2afb0957509cfbd6907ca Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 18 Jun 2024 16:36:02 +0000 Subject: [PATCH 4/5] update dmsghttp-update to release process --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 683687fd0..2384515e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,9 @@ jobs: - name: Releasing env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: make github-release + run: | + make dmsghttp-update + make github-release darwin: needs: linux @@ -39,6 +41,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + make dmsghttp-update make github-release-darwin make mac-installer-release @@ -60,5 +63,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + make dmsghttp-update make github-release-windows make windows-installer-release From bf957d5188ab158e0a4bbb9252f28de158f35575 Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 18 Jun 2024 18:39:13 +0000 Subject: [PATCH 5/5] remove dmsghttp-update from release pipeline --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2384515e1..683687fd0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,9 +20,7 @@ jobs: - name: Releasing env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - make dmsghttp-update - make github-release + run: make github-release darwin: needs: linux @@ -41,7 +39,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - make dmsghttp-update make github-release-darwin make mac-installer-release @@ -63,6 +60,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - make dmsghttp-update make github-release-windows make windows-installer-release