refactoring: removed app and ui

azar-writes-code · Nov 2, 2023 · 5e1f5fd · 5e1f5fd
1 parent cf6b06a
commit 5e1f5fd
Show file tree

Hide file tree

Showing 1,523 changed files with 7,618 additions and 48,322 deletions.
diff --git a/core/.dockerignore → .dockerignore b/core/.dockerignore → .dockerignore
diff --git a/.github/workflows/core-ci.yml → .github/workflows/ci.yml b/.github/workflows/core-ci.yml → .github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: core-ci
+name: compage-ci
 
 on:
   push:
@@ -25,25 +25,20 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: '1.20'
-          cache-dependency-path: '**/core/go.sum'
+          cache-dependency-path: '**/go.sum'
       - name: Build
         run: |
-          cd core
           go build -v ./...
-          cd ..
       - name: golangci-lint
         run: |
           go install github.com/golangci/golangci-lint/cmd/[email protected]
-          cd core
           golangci-lint run
-          cd ..
       - name: Install Protoc
         uses: arduino/setup-protoc@v2
         with:
           version: "23.x"
       - name: Test
         run: |
-          cd core
           sudo apt install dos2unix -y
           # install openapi-generator-cli
           mkdir -p $HOME/ogc
@@ -54,11 +49,10 @@ jobs:
           export GOBIN=$GOPATH/bin
           export PATH=$PATH:$GOPATH:$GOBIN:$HOME/ogc
           go test -v ./... -race -coverprofile=coverage.out -coverpkg=./... -covermode=atomic
-          cd ..
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          files: ./core/coverage.out
+          files: ./coverage.out
           flags: core
           token: ${{secrets.CODECOV_TOKEN}}
       - name: Run Trivy vulnerability scanner in repo mode
@@ -97,7 +91,7 @@ jobs:
         id: metadata
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository }}/core
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -114,16 +108,16 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           # relative path to the place where source code with Dockerfile is located
-          context: ./core
+          context: .
           # Note: tags have to be all lower-case
-          tags: ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ github.run_id }}
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.run_id }}
           # ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
           # build on feature branches, push only on the main branch
           push: true
 #      - uses: goodwithtech/dockle-action@main
 #        with:
-#          image: ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ github.run_id }}
+#          image: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.run_id }}
 #          format: 'list'
 #          exit-code: '1'
 #          exit-level: 'warn'
@@ -132,11 +126,11 @@ jobs:
         uses: sigstore/cosign-installer@main
       - name: Sign the images
         run: |
-          cosign sign -y ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ github.run_id }}
+          cosign sign -y ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.run_id }}
         env:
           COSIGN_EXPERIMENTAL: 1
       - name: Verify the pushed tags
-        run: cosign verify ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ github.run_id }} --certificate-identity ${{ env.GH_URL }}/${{ github.repository }}/.github/workflows/core-ci.yml@refs/heads/main --certificate-oidc-issuer https://token.actions.githubusercontent.com
+        run: cosign verify ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.run_id }} --certificate-identity ${{ env.GH_URL }}/${{ github.repository }}/.github/workflows/ci.yml@refs/heads/main --certificate-oidc-issuer https://token.actions.githubusercontent.com
         env:
           COSIGN_EXPERIMENTAL: 1
       - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph

diff --git a/.github/workflows/core-release.yml → .github/workflows/release.yml b/.github/workflows/core-release.yml → .github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: core-release
+name: compage-release
 on:
   push:
     tags:
@@ -37,11 +37,11 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           push: true
-          context: ./core
-          tags: ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ env.RELEASE_VERSION }}
+          context: .
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.RELEASE_VERSION }}
 #      - uses: goodwithtech/dockle-action@main
 #        with:
-#          image: ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ github.run_id }}
+#          image: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.run_id }}
 #          format: 'list'
 #          exit-code: '1'
 #          exit-level: 'warn'
@@ -50,11 +50,11 @@ jobs:
         uses: sigstore/cosign-installer@main
       - name: Sign the images
         run: |
-          cosign sign -y ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ env.RELEASE_VERSION }}
+          cosign sign -y ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.RELEASE_VERSION }}
         env:
           COSIGN_EXPERIMENTAL: 1
       - name: Verify the pushed tags
-        run: cosign verify ${{ env.REGISTRY }}/${{ github.repository }}/core:${{ env.RELEASE_VERSION }} --certificate-identity ${{ env.GH_URL }}/${{ github.repository }}/.github/workflows/core-release.yml@refs/tags/${{ env.RELEASE_VERSION }}  --certificate-oidc-issuer https://token.actions.githubusercontent.com
+        run: cosign verify ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.RELEASE_VERSION }} --certificate-identity ${{ env.GH_URL }}/${{ github.repository }}/.github/workflows/release.yml@refs/tags/${{ env.RELEASE_VERSION }}  --certificate-oidc-issuer https://token.actions.githubusercontent.com
         env:
           COSIGN_EXPERIMENTAL: 1
       - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph

diff --git a/.github/workflows/ui-ci.yml b/.github/workflows/ui-ci.yml
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,14 @@
 /node_modules/
 /app/build/
 /app/node_modules/
-/core/.devspace/
-/core/.idea/
+/.devspace/
+/.idea/
 /.devspace/logs/default.log
-/app/scratch/
-/core/core
+/scratch/
 /.idea
-/core/coverage.out
-/app/coverage
+/coverage.out
+/coverage
 openapitools.json
-/core/openapitools.json
-/ui/.env.kind.cluster
-/app/compage-app.sqlite3
+/openapitools.json
 /deploy/build/
-/app/secure-connect-compage.zip
-/charts/compage/secure-connect-compage.zip
+compage
diff --git a/.gitmodules b/.gitmodules
@@ -1,28 +1,28 @@
-[submodule "core/templates/compage-template-go"]
-	path = core/templates/compage-template-go
+[submodule "templates/compage-template-go"]
+	path = templates/compage-template-go
 	url =  https://github.com/intelops/compage-template-go.git
     branch = template-v8
-[submodule "core/templates/compage-template-java"]
-	path = core/templates/compage-template-java
+[submodule "templates/compage-template-java"]
+	path = templates/compage-template-java
 	url =  https://github.com/intelops/compage-template-java.git
     branch = template-v1
-[submodule "core/templates/compage-template-javascript"]
-	path = core/templates/compage-template-javascript
+[submodule "templates/compage-template-javascript"]
+	path = templates/compage-template-javascript
 	url =  https://github.com/intelops/compage-template-javascript.git
     branch = template-v1
-[submodule "core/templates/compage-template-python"]
-	path = core/templates/compage-template-python
+[submodule "templates/compage-template-python"]
+	path = templates/compage-template-python
 	url =  https://github.com/intelops/compage-template-python.git
     branch = template-v1
-[submodule "core/templates/compage-template-ruby"]
-	path = core/templates/compage-template-ruby
+[submodule "templates/compage-template-ruby"]
+	path = templates/compage-template-ruby
 	url =  https://github.com/intelops/compage-template-ruby.git
     branch = template-v1
-[submodule "core/templates/compage-template-rust"]
-	path = core/templates/compage-template-rust
+[submodule "templates/compage-template-rust"]
+	path = templates/compage-template-rust
 	url =  https://github.com/intelops/compage-template-rust.git
     branch = template-v1
-[submodule "core/templates/compage-template-typescript"]
-	path = core/templates/compage-template-typescript
+[submodule "templates/compage-template-typescript"]
+	path = templates/compage-template-typescript
 	url =  https://github.com/intelops/compage-template-typescript.git
     branch = template-v1
diff --git a/core/.golangci.yml → .golangci.yml b/core/.golangci.yml → .golangci.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,9 +32,7 @@ To contribute code.
 5. Clone the project: `git clone https://github.com/[YOUR_USERNAME]/compage && cd compage`
 6. kindly refer compage.md file to know the structure of the project.
 7. The Compage has three servers (subprojects) which need to be started to run the compage on local
-   - core (Golang), navigate to core directory and follow its [core README](./core/README.md)
-   - app (Node.js), navigate to app directory and follow its [app README](./app/README.md)
-   - ui (ReactJs), navigate to ui directory and follow its [ui README](./ui/README.md)
+   - (Golang), navigate to core directory and follow its [core README](./core/README.md)
 8. Commit changes *([Please refer the commit message conventions](https://www.conventionalcommits.org/en/v1.0.0/))*
 9. Push commits.
 10. Open pull request.
@@ -49,7 +47,7 @@ To contribute code.
    ```shell
   export PATH="$PATH:$(go env GOPATH)/bin"
    ```
-- Download buf binary from this link—https://github.com/bufbuild/buf/releases and fire the command from core directory of compage.
+- Download buf binary from this link—https://github.com/bufbuild/buf/releases and fire the command from root directory of compage.
    ```shell
    buf generate
    ```

diff --git a/core/Dockerfile → Dockerfile b/core/Dockerfile → Dockerfile