Release Mdpx (do not merge)

.github/workflows/ci.yml

@@ -12,43 +12,50 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
-        go-version: ^1.20
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+        go-version-file: 'go.mod'
+        cache-dependency-path: 'go.sum'
     - name: Build
       run: |
        make build
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: ^1.20
-      - uses: actions/checkout@v2
+          go-version-file: 'go.mod'
+          cache-dependency-path: 'go.sum'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           args: --timeout 4m0s
   vet:
     name: Vet
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          cache-dependency-path: 'go.sum'
       - name: Vet
         run: go vet ./...
   test:
     name: Test
     needs: [ build ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: ^1.20
+          go-version-file: 'go.mod'
+          cache-dependency-path: 'go.sum'
       - name: Generated files
         run: |
           export PATH=$PATH:$(go env GOPATH)/bin
@@ -59,53 +66,3 @@ jobs:
          make test
         env:
          GOPATH: /home/runner/work/cli/go
-  acceptance:
-    name: Acceptance
-    needs: [ test ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Acceptance
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.MEROXA_MACHINE }}
-          repository: meroxa/acceptance
-          path: acceptance
-      - name: Build And Run
-        working-directory: ./acceptance
-        env:
-          MEROXA_AUTH_CLIENT_ID: ${{ secrets.AUTH0_ACCEPTANCE_STAGING_CLIENT_ID }}
-          MEROXA_AUTH_DOMAIN: ${{ secrets.AUTH0_STAGING_DOMAIN }}
-          MEROXA_AUTH_AUDIENCE: ${{ secrets.AUTH0_STAGING_AUDIENCE }}
-          MEROXA_AUTH_CLIENT_SECRET: ${{ secrets.AUTH0_ACCEPTANCE_STAGING_CLIENT_SECRET }}
-          MEROXA_AUTH_PASSWORD: ${{ secrets.AUTH0_PASSWORD }}
-          MEROXA_AUTH_USERNAME: ${{ secrets.AUTH0_USERNAME }}
-          MEROXA_AUTH_PASSWORD2: ${{ secrets.AUTH0_PASSWORD2 }}
-          MEROXA_AUTH_USERNAME2: ${{ secrets.AUTH0_USERNAME2 }}
-          PG_URL: ${{ secrets.TEST_DB_URL }}
-          PRIVATE_PG_URL: ${{ secrets.TEST_PRIVATE_PG_URL }}
-          MYSQL_URL:  ${{ secrets.TEST_MYSQL_URL }}
-          SQLSERVER_URL: ${{ secrets.TEST_SQLSERVER_URL }}
-          MEROXA_API_URL: "https://api.staging.meroxa.io"
-          BASTION_PRIVATE_KEY: ${{ secrets.TEST_BASTION_PRIVATE_KEY }}
-          BASTION_USER: "ec2-user"
-          BASTION_URL: ${{ secrets.TEST_BASTION_URL }}
-        run: |
-          docker build -t meroxa/acceptance --build-arg CLI_BRANCH=$GITHUB_HEAD_REF .
-          docker run \
-            -e MEROXA_AUTH_DOMAIN=${MEROXA_AUTH_DOMAIN} \
-            -e MEROXA_AUTH_CLIENT_ID=${MEROXA_AUTH_CLIENT_ID} \
-            -e MEROXA_AUTH_CLIENT_SECRET=${MEROXA_AUTH_CLIENT_SECRET} \
-            -e MEROXA_AUTH_PASSWORD=${MEROXA_AUTH_PASSWORD} \
-            -e MEROXA_AUTH_USERNAME=${MEROXA_AUTH_USERNAME} \
-            -e MEROXA_AUTH_PASSWORD2=${MEROXA_AUTH_PASSWORD2} \
-            -e MEROXA_AUTH_USERNAME2=${MEROXA_AUTH_USERNAME2} \
-            -e MEROXA_AUTH_AUDIENCE=${MEROXA_AUTH_AUDIENCE} \
-            -e ACCEPTANCE_TEST_POSTGRES_URL=${PG_URL} \
-            -e ACCEPTANCE_TEST_PRIVATE_POSTGRES_URL=${PRIVATE_PG_URL} \
-            -e ACCEPTANCE_TEST_MYSQL_URL=${MYSQL_URL} \
-            -e ACCEPTANCE_TEST_SQLSERVER_URL=${SQLSERVER_URL} \
-            -e ACCEPTANCE_TEST_BASTION_PRIVATE_KEY="${BASTION_PRIVATE_KEY}" \
-            -e ACCEPTANCE_TEST_BASTION_USER=${BASTION_USER} \
-            -e ACCEPTANCE_TEST_BASTION_URL=${BASTION_URL} \
-            -e ACCEPTANCE_TEST_API_HOST=${MEROXA_API_URL} \
-            meroxa/acceptance -test.v

.github/workflows/fig.yml

@@ -10,12 +10,13 @@ jobs:
   publish-spec:
     runs-on: ubuntu-latest
     steps:
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v4
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
-        go-version: ^1.20
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v4  
+        go-version-file: 'go.mod'
+        cache-dependency-path: 'go.sum'
     - name: Run make fig
       run: |
        make fig

.github/workflows/release.yml

@@ -18,9 +18,9 @@ jobs:
       - run: git fetch --force --tags
       -
         name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       -
         name: Import GPG key
         id: import_gpg

.golangci.yml

@@ -68,7 +68,7 @@ linters-settings:
           - github.com/stretchr/testify
           - github.com/withfig/autocomplete-tools/integrations/cobra
           - github.com/davecgh/go-spew/spew
-
+          - github.com/pocketbase/pocketbase/tools/types
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint

Makefile

@@ -41,10 +41,10 @@ endif
 fig:
 	go run gen-spec/main.go
 
+# downgrade linter until https://github.com/golangci/golangci-lint/issues/4239 is fixed
 .PHONY: lint
 lint:
-	docker pull golangci/golangci-lint:latest
-	docker run --rm -v $(CURDIR):/app -w /app golangci/golangci-lint:latest golangci-lint run --timeout 5m -v
+	docker run --rm -v $(CURDIR):/app -w /app golangci/golangci-lint:v1.57.2 golangci-lint run --timeout 5m -v
 
 .PHONY: generate
 generate: mockgen-install

README.md

@@ -61,7 +61,7 @@ Prerequisite Tools:
 
 To build from source:
 
-1. The CLI depends on [meroxa-go](github.com/meroxa/meroxa-go). To update vendoring the dependency, you'll need to run the following:
+1. To update vendoring the dependency, you'll need to run the following:
 
 ```
 make gomod
@@ -73,9 +73,6 @@ make gomod
 make build
 ```
 
-### Development Configuration
-The [meroxa-dev CLI](https://github.com/meroxa/meroxa-dev#install) makes it convenient to set the necessary env vars for different dev environments.
-
 ## Release
 
 A [goreleaser](https://github.com/goreleaser/goreleaser) GitHub Action is
@@ -108,6 +105,10 @@ func appendCell(cells []*simpletable.Cell, text string) []*simpletable.Cell {
      ^
 ```
 
+## Using Meroxa CLI 
+
+To start using the Meroxa CLI, you'll need to have an existing platform user from either local or deployed mdpx instance. Meroxa CLI will prompt you for tenant url ,which should be a full url (e.g http://localhost:8090), user email and password. 
+
 ## Tests
 
 To run the test suite:
@@ -116,25 +117,13 @@ To run the test suite:
 make test
 ```
 
+
 ## Shell Completion
 
 If you want to enable shell completion manually, you can generate your own using our `meroxa completion` command.
 
 Type `meroxa help completion` for more information, or simply take a look at our [documentation](docs/cmd/md/meroxa_completion.md).
 
-## Development with local TurbineJS dependency
-
-The CLI offers a mode, in which the local version of `turbine-js` is loaded by default which can be useful for developing the CLI and the JS dependency locally when contributing to this project.
-
-You can run the cli in this mode, by adding the following environment variable into your `.envrc` at the root of this project's directory:
-
-```bash
-MEROXA_USE_LOCAL_TURBINE_JS=true
-```
-
-If you run into any `executable not found` issues, please ensure that you have cloned [turbine-js](https://github.com/meroxa/turbine-js) locally and
-installed it globally via running `npm install -g .` in the turbine-js directory.
-
 If you'd like to see this development mode extended with other dependencies or features, you can send us a feature request in our Github issues: https://github.com/meroxa/cli/issues
 
 ## Troubleshooting
@@ -163,4 +152,4 @@ Verify the correct setup, by running ` cat ~/.gitconfig`. You should see the fol
 	insteadOf = https://github.com
 ```
 
-Run the `make gomod` command again, and you should see all dependencies being downloaded successfully.
+Run the `make gomod` command again, and you should see all dependencies being downloaded successfully.

cmd/meroxa/builder/builder.go

@@ -36,7 +36,6 @@ import (
 	"github.com/meroxa/cli/cmd/meroxa/global"
 	"github.com/meroxa/cli/config"
 	"github.com/meroxa/cli/log"
-	"github.com/meroxa/meroxa-go/pkg/meroxa"
 )
 
 type Command interface {
@@ -64,10 +63,10 @@ type CommandWithArgs interface {
 	ParseArgs([]string) error
 }
 
-type CommandWithClient interface {
+type CommandWithBasicClient interface {
 	Command
-	// Client provides the meroxa client to the command.
-	Client(meroxa.Client)
+	// Client provides the basic client to the command.
+	BasicClient(client global.BasicClient)
 }
 
 type CommandWithConfig interface {
@@ -199,7 +198,7 @@ func BuildCobraCommand(c Command) *cobra.Command {
 
 	buildCommandWithAliases(cmd, c)
 	buildCommandWithArgs(cmd, c)
-	buildCommandWithClient(cmd, c)
+	buildCommandWithBasicClient(cmd, c)
 	buildCommandWithConfig(cmd, c)
 
 	// buildCommandWithConfirmWithValue needs to go before buildCommandWithExecute to make sure there's a confirmation prompt
@@ -253,8 +252,8 @@ func buildCommandWithArgs(cmd *cobra.Command, c Command) {
 	}
 }
 
-func buildCommandWithClient(cmd *cobra.Command, c Command) {
-	v, ok := c.(CommandWithClient)
+func buildCommandWithBasicClient(cmd *cobra.Command, c Command) {
+	v, ok := c.(CommandWithBasicClient)
 	if !ok {
 		return
 	}
@@ -267,11 +266,11 @@ func buildCommandWithClient(cmd *cobra.Command, c Command) {
 				return err
 			}
 		}
-		c, err := global.NewClient()
+		cl, err := global.NewBasicClient()
 		if err != nil {
 			return err
 		}
-		v.Client(c)
+		v.BasicClient(cl)
 		return nil
 	}
 }