diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json index 22fe8a254..9f38188a8 100644 --- a/.github/release-please/manifest.json +++ b/.github/release-please/manifest.json @@ -1,3 +1,3 @@ { - "packages/cli/package": "0.23.0" + "packages/cli/package": "0.23.1" } diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index bac4fc330..d9d558938 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,6 +16,9 @@ env: jobs: docs: + permissions: + contents: write + id-token: write env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} @@ -50,6 +53,28 @@ jobs: restore-keys: | ${{ runner.os }}-turbo- + - name: Import secrets + uses: hashicorp/vault-action@v3.0.0 + id: secrets + with: + url: https://vault.fluence.dev + path: jwt/github + role: ci + method: jwt + jwtGithubAudience: "https://github.com/fluencelabs" + jwtTtl: 300 + exportToken: false + secrets: | + kv/docker-registry/basicauth/ci username | DOCKER_USERNAME ; + kv/docker-registry/basicauth/ci password | DOCKER_PASSWORD ; + + - name: Login to private docker registry + uses: docker/login-action@v3 + with: + registry: docker.fluence.dev + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_PASSWORD }} + - name: Run on each commit run: yarn on-each-commit diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 5ebdc0398..791ae9e7f 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -68,7 +68,16 @@ jobs: secrets: | kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN; kv/ci/fcli-binaries id | AWS_ACCESS_KEY_ID ; - kv/ci/fcli-binaries secret | AWS_SECRET_ACCESS_KEY + kv/ci/fcli-binaries secret | AWS_SECRET_ACCESS_KEY ; + kv/docker-registry/basicauth/ci username | DOCKER_USERNAME ; + kv/docker-registry/basicauth/ci password | DOCKER_PASSWORD ; + + - name: Login to private docker registry + uses: docker/login-action@v3 + with: + registry: docker.fluence.dev + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_PASSWORD }} - name: Setup node with self-hosted npm registry uses: actions/setup-node@v4 diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 4f7b2a5f9..765a14472 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -18,6 +18,8 @@ on: env: CI: true FORCE_COLOR: true + AWS_REGION: "eu-west-1" + AWS_S3_FORCE_PATH_STYLE: true jobs: promote: diff --git a/packages/cli/package/docs/commands/README.md b/packages/cli/package/docs/commands/README.md index 4bdf2717f..2437d0b83 100644 --- a/packages/cli/package/docs/commands/README.md +++ b/packages/cli/package/docs/commands/README.md @@ -84,7 +84,7 @@ DESCRIPTION Show contract addresses for the fluence environment and accounts for the local environment ``` -_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/chain/info.ts)_ +_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/chain/info.ts)_ ## `fluence default env [ENV]` @@ -107,7 +107,7 @@ EXAMPLES $ fluence default env ``` -_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/default/env.ts)_ +_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/default/env.ts)_ ## `fluence help [COMMAND]` @@ -150,7 +150,7 @@ EXAMPLES $ fluence local down ``` -_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/local/down.ts)_ +_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/local/down.ts)_ ## `fluence local init` @@ -175,7 +175,7 @@ EXAMPLES $ fluence local init ``` -_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/local/init.ts)_ +_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/local/init.ts)_ ## `fluence local logs` @@ -196,7 +196,7 @@ EXAMPLES $ fluence local logs ``` -_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/local/logs.ts)_ +_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/local/logs.ts)_ ## `fluence local ps` @@ -217,7 +217,7 @@ EXAMPLES $ fluence local ps ``` -_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/local/ps.ts)_ +_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/local/ps.ts)_ ## `fluence local up` @@ -254,7 +254,7 @@ EXAMPLES $ fluence local up ``` -_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/local/up.ts)_ +_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/local/up.ts)_ ## `fluence provider cc-activate` @@ -282,7 +282,7 @@ DESCRIPTION Add FLT collateral to capacity commitment to activate it. Alias: fluence provider ca ``` -_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/cc-activate.ts)_ +_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/cc-activate.ts)_ ## `fluence provider cc-create` @@ -309,7 +309,7 @@ DESCRIPTION Create Capacity commitment. Alias: fluence provider cc ``` -_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/cc-create.ts)_ +_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/cc-create.ts)_ ## `fluence provider cc-finish` @@ -338,7 +338,7 @@ DESCRIPTION commitments and finish capacity commitments. Aliases: fluence provider ccf, fluence provider cc-collateral-withdraw ``` -_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/cc-finish.ts)_ +_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/cc-finish.ts)_ ## `fluence provider cc-info` @@ -367,7 +367,7 @@ DESCRIPTION Get info about capacity commitments. Alias: fluence provider ci ``` -_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/cc-info.ts)_ +_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/cc-info.ts)_ ## `fluence provider cc-remove` @@ -396,7 +396,7 @@ DESCRIPTION provider cr ``` -_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/cc-remove.ts)_ +_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/cc-remove.ts)_ ## `fluence provider cc-rewards-withdraw` @@ -424,7 +424,7 @@ DESCRIPTION Withdraw FLT rewards from capacity commitments. Alias: fluence provider crw ``` -_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/cc-rewards-withdraw.ts)_ +_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/cc-rewards-withdraw.ts)_ ## `fluence provider deal-exit` @@ -448,7 +448,7 @@ DESCRIPTION Exit from deal. Alias: fluence provider de ``` -_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/deal-exit.ts)_ +_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/deal-exit.ts)_ ## `fluence provider deal-list` @@ -470,7 +470,7 @@ DESCRIPTION List all deals. Alias: fluence provider dl ``` -_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/deal-list.ts)_ +_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/deal-list.ts)_ ## `fluence provider deal-rewards-info [DEAL-ADDRESS] [ON-CHAIN-WORKER-ID]` @@ -497,7 +497,7 @@ DESCRIPTION Deal rewards info. Alias: fluence provider dri ``` -_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/deal-rewards-info.ts)_ +_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/deal-rewards-info.ts)_ ## `fluence provider deal-rewards-withdraw` @@ -521,7 +521,7 @@ DESCRIPTION Withdraw USDC rewards from deals. Alias: fluence provider drw ``` -_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/deal-rewards-withdraw.ts)_ +_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/deal-rewards-withdraw.ts)_ ## `fluence provider deploy` @@ -551,7 +551,7 @@ EXAMPLES $ fluence provider deploy ``` -_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/deploy.ts)_ +_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/deploy.ts)_ ## `fluence provider gen` @@ -582,7 +582,7 @@ EXAMPLES $ fluence provider gen ``` -_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/gen.ts)_ +_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/gen.ts)_ ## `fluence provider info` @@ -611,7 +611,7 @@ DESCRIPTION Print peer signing wallets and peer ids. Alias: fluence provider i ``` -_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/info.ts)_ +_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/info.ts)_ ## `fluence provider init` @@ -635,7 +635,7 @@ DESCRIPTION Init provider config. Creates a provider.yaml file ``` -_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/init.ts)_ +_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/init.ts)_ ## `fluence provider offer-create` @@ -660,7 +660,7 @@ DESCRIPTION Create offers. You have to be registered as a provider to do that. Alias: fluence provider oc ``` -_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/offer-create.ts)_ +_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/offer-create.ts)_ ## `fluence provider offer-info` @@ -687,7 +687,7 @@ DESCRIPTION Get info about offers. Alias: fluence provider oi ``` -_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/offer-info.ts)_ +_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/offer-info.ts)_ ## `fluence provider offer-remove` @@ -714,7 +714,7 @@ DESCRIPTION Remove offers. Alias: fluence provider or ``` -_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/offer-remove.ts)_ +_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/offer-remove.ts)_ ## `fluence provider offer-update` @@ -739,7 +739,7 @@ DESCRIPTION Update offers. Alias: fluence provider ou ``` -_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/offer-update.ts)_ +_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/offer-update.ts)_ ## `fluence provider register` @@ -761,7 +761,7 @@ DESCRIPTION Register as a provider. Alias: fluence provider r ``` -_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/register.ts)_ +_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/register.ts)_ ## `fluence provider tokens-distribute` @@ -789,7 +789,7 @@ DESCRIPTION Distribute FLT tokens to peers. Alias: fluence provider td ``` -_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/tokens-distribute.ts)_ +_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/tokens-distribute.ts)_ ## `fluence provider tokens-withdraw` @@ -818,7 +818,7 @@ DESCRIPTION Withdraw FLT tokens from peers. Alias: fluence provider tw ``` -_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/tokens-withdraw.ts)_ +_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/tokens-withdraw.ts)_ ## `fluence provider update` @@ -840,7 +840,7 @@ DESCRIPTION Update provider info. Alias: fluence provider u ``` -_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.0/src/commands/provider/update.ts)_ +_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.23.1/src/commands/provider/update.ts)_ ## `fluence update [CHANNEL]` diff --git a/packages/cli/package/package.json b/packages/cli/package/package.json index e08f5c680..6b7f43233 100644 --- a/packages/cli/package/package.json +++ b/packages/cli/package/package.json @@ -1,6 +1,6 @@ { "name": "@fluencelabs/cli", - "version": "0.23.0", + "version": "0.23.1", "description": "CLI for working with Fluence network", "keywords": [ "fluence", @@ -56,7 +56,7 @@ "whatwg-url": "^14.0.0" }, "dependencies": { - "@fluencelabs/deal-ts-clients": "0.22.1", + "@fluencelabs/deal-ts-clients": "0.22.2-v0-22-1-new-urls-and-addrs-up-2fa7e7e-7663-1.0", "@kubernetes/client-node": "github:fluencelabs/kubernetes-client-javascript#e72ee00a52fec4eb4a8327632895d888ee504f4d", "@libp2p/crypto": "4.0.1", "@libp2p/peer-id-factory": "4.0.5", diff --git a/packages/cli/package/src/versions.json b/packages/cli/package/src/versions.json index a45e5c9e3..7a03956c1 100644 --- a/packages/cli/package/src/versions.json +++ b/packages/cli/package/src/versions.json @@ -1,6 +1,6 @@ { "protocolVersion": 1, - "chain-rpc": "fluencelabs/chain-rpc:0.22.0", - "chain-deploy-script": "fluencelabs/chain-deploy-script:0.22.0", - "subgraph-deploy-script": "fluencelabs/subgraph-deploy-script:0.22.0" + "chain-rpc": "docker.fluence.dev/chain-rpc:feat-marketplace-v2-resources-d1eaf27-7661-1", + "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:feat-marketplace-v2-resources-d1eaf27-7661-1", + "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:feat-marketplace-v2-resources-d1eaf27-7661-1" } diff --git a/packages/cli/package/yarn.lock b/packages/cli/package/yarn.lock index f9354243e..6e377bfa4 100644 --- a/packages/cli/package/yarn.lock +++ b/packages/cli/package/yarn.lock @@ -1964,7 +1964,7 @@ __metadata: dependencies: "@actions/core": "npm:1.11.1" "@aws-sdk/lib-storage": "npm:^3.501.0" - "@fluencelabs/deal-ts-clients": "npm:0.22.1" + "@fluencelabs/deal-ts-clients": "npm:0.22.2-v0-22-1-new-urls-and-addrs-up-2fa7e7e-7663-1.0" "@graphql-codegen/cli": "npm:^5.0.3" "@graphql-codegen/typescript": "npm:^4.1.1" "@graphql-codegen/typescript-graphql-request": "npm:^6.2.0" @@ -2038,9 +2038,9 @@ __metadata: languageName: unknown linkType: soft -"@fluencelabs/deal-ts-clients@npm:0.22.1": - version: 0.22.1 - resolution: "@fluencelabs/deal-ts-clients@npm:0.22.1" +"@fluencelabs/deal-ts-clients@npm:0.22.2-v0-22-1-new-urls-and-addrs-up-2fa7e7e-7663-1.0": + version: 0.22.2-v0-22-1-new-urls-and-addrs-up-2fa7e7e-7663-1.0 + resolution: "@fluencelabs/deal-ts-clients@npm:0.22.2-v0-22-1-new-urls-and-addrs-up-2fa7e7e-7663-1.0" dependencies: "@graphql-typed-document-node/core": "npm:^3.2.0" debug: "npm:^4.3.4" @@ -2052,7 +2052,7 @@ __metadata: graphql-tag: "npm:^2.12.6" ipfs-http-client: "npm:^60.0.1" multiformats: "npm:^13.0.1" - checksum: 10c0/10009e68a5d2441bfa749cb00c2944bd705dd7b1ff755e12649a50f8e408ad9f984ffbc17b54006d5c92cef4f90d0aa0eac126bb621c28cf06b1342124242b5a + checksum: 10c0/3c99069e7a8a072c684129b47f419fc6df9e64adda1077893636b6efbf708fa9d70d2c5d7e580a0d767838499f79530b3153a7d08cdc2eeeaaee3d0086f88fcc languageName: node linkType: hard