Merge pull request #1335 from merico-dev/refactor-github-actions-clean

refactor: delete github-action languages plugin

Author: daniel-hutao

cmd/plugin/github-actions/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
-	"github.com/devstream-io/devstream/internal/pkg/plugin/githubactions/general"
+	general "github.com/devstream-io/devstream/internal/pkg/plugin/githubactions"
 	"github.com/devstream-io/devstream/internal/pkg/statemanager"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )

cmd/plugin/githubactions-golang/main.go

@@ -41,7 +41,7 @@ However, if you are like us, who prefer to do things hands-on and get their hand
 DevStream will use the following plugins to achieve the goal described in [Section 0](#0-goal):
 
 1. [repo-scaffolding](../plugins/repo-scaffolding.md)
-2. [githubactions-golang](../plugins/githubactions-golang.md)
+2. [github-actions](../plugins/github-actions.md)
 3. [helm-installer](../plugins/helm-installer/helm-installer.md)
 4. [argocdapp](../plugins/argocdapp.md)
 
@@ -138,34 +138,33 @@ tools:
   options:
     destinationRepo:
       owner: [[ githubUser ]]
-      repo: [[ app ]]
+      name: [[ app ]]
       branch: main
-      repoType: github
+      scmType: github
     sourceRepo:
       org: devstream-io
-      repo: dtm-repo-scaffolding-python
-      repoType: github
-    vars:
-      imageRepo: [[ dockerUser ]]/[[ app ]]
-- name: githubactions-python
-  instanceID: default
+      name: dtm-scaffolding-flask
+      scmType: github
+- name: github-actions
+  instanceID: flask
   dependsOn: [ repo-scaffolding.myapp ]
   options:
-    owner: [[ githubUser ]]
-    repo:  [[ app ]]
-    language:
-      name: python
-    branch: main
-    docker:
-      registry:
-        type: dockerhub
-        username: [[ dockerUser ]]
-        repository: [[ app ]]
+    scm:
+      owner: [[ githubUser ]]
+      name:  [[ app ]]
+      scmType: github
+    pipeline:
+      configLocation: https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml
+      language:
+        name: python
+        framework: flask
+      imageRepo:
+        user: [[ dockerUser ]]
 - name: helm-installer
   instanceID: argocd
 - name: argocdapp
   instanceID: default
-  dependsOn: [ "helm-installer.argocd", "githubactions-python.default" ]
+  dependsOn: [ "helm-installer.argocd", "github-actions.flask" ]
   options:
     app:
       name: [[ app ]]
@@ -177,6 +176,8 @@ tools:
       valuefile: values.yaml
       path: helm/[[ app ]]
       repoURL: ${{repo-scaffolding.myapp.outputs.repoURL}}
+    imageRepo:
+      user: [[ dockerUser ]]
 ```
 
 Then modify the `vars` section in the `config.yaml` file accordingly. Please update the values for `githubUser` and `dockerUser` to your real users.
@@ -194,15 +195,15 @@ The following environment variables are required for this to work:
 
 ```bash
 export GITHUB_TOKEN="YOUR_GITHUB_TOKEN_HERE"
-export DOCKERHUB_TOKEN="YOUR_DOCKERHUB_TOKEN_HERE"
+export IMAGE_REPO_PASSWORD="YOUR_DOCKERHUB_TOKEN_HERE"
 ```
 
 > Note:
 > 
 > if you don't know how to create these two tokens, check out:
 > 
 > - GITHUB_TOKEN: [Manage API tokens for your Atlassian account](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
-> - DOCKERHUB_TOKEN: [Manage access tokens](https://docs.docker.com/docker-hub/access-tokens/)
+> - IMAGE_REPO_PASSWORD: [Manage access tokens](https://docs.docker.com/docker-hub/access-tokens/)
 
 ---
 
@@ -220,7 +221,7 @@ You'll get some outputs similar to the following:
 
 ```bash
 2022-12-05 17:46:01 ℹ [INFO]  Using dir </Users/tiexin/.devstream/plugins> to store plugins.
-2022-12-05 17:46:01 ℹ [INFO]  -------------------- [  repo-scaffolding-darwin-arm64_0.10.1  ] --------------------
+2022-12-05 17:46:01 ℹ [INFO]  -------------------- [  repo-scaffolding-darwin-arm64_0.10.2  ] --------------------
 ... (omitted)
 ... (omitted)
 2022-12-05 17:46:51 ✔ [SUCCESS]  Initialize finished.
@@ -243,7 +244,7 @@ You will see similar outputs as the following:
 2022-12-05 17:49:49 ℹ [INFO]  Using local backend. State file: devstream.state.
 2022-12-05 17:49:49 ℹ [INFO]  Tool (repo-scaffolding/myapp) found in config but doesn't exist in the state, will be created.
 2022-12-05 17:49:49 ℹ [INFO]  Tool (helm-installer/argocd) found in config but doesn't exist in the state, will be created.
-2022-12-05 17:49:49 ℹ [INFO]  Tool (githubactions-python/default) found in config but doesn't exist in the state, will be created.
+2022-12-05 17:49:49 ℹ [INFO]  Tool (github-actions/flask) found in config but doesn't exist in the state, will be created.
 2022-12-05 17:49:49 ℹ [INFO]  Tool (argocdapp/default) found in config but doesn't exist in the state, will be created.
 2022-12-05 17:49:49 ℹ [INFO]  Start executing the plan.
 2022-12-05 17:49:49 ℹ [INFO]  Changes count: 4.
@@ -341,7 +342,7 @@ And you will get similar outputs to the following:
 2022-12-05 17:59:25 ℹ [INFO]  Delete started.
 2022-12-05 17:59:26 ℹ [INFO]  Using local backend. State file: devstream.state.
 2022-12-05 17:59:26 ℹ [INFO]  Tool (argocdapp/default) will be deleted.
-2022-12-05 17:59:26 ℹ [INFO]  Tool (githubactions-python/default) will be deleted.
+2022-12-05 17:59:26 ℹ [INFO]  Tool (github-actions/flask) will be deleted.
 2022-12-05 17:59:26 ℹ [INFO]  Tool (repo-scaffolding/myapp) will be deleted.
 2022-12-05 17:59:26 ℹ [INFO]  Tool (helm-installer/argocd) will be deleted.
 2022-12-05 17:59:26 ℹ [INFO]  Start executing the plan.

cmd/plugin/githubactions-nodejs/main.go

@@ -41,7 +41,7 @@
 DevStream 将使用下面的插件来实现[第 0 节](#0-目标)中描述的目标：
 
 1. [repo-scaffolding](../plugins/repo-scaffolding.md)
-2. [githubactions-golang](../plugins/githubactions-golang.md)
+2. [github-actions](../plugins/github-actions.md)
 3. [helm-installer](../plugins/helm-installer/helm-installer.md)
 4. [argocdapp](../plugins/argocdapp.md)
 
@@ -138,34 +138,33 @@ tools:
   options:
     destinationRepo:
       owner: [[ githubUser ]]
-      repo: [[ app ]]
+      name: [[ app ]]
       branch: main
-      repoType: github
+      scmType: github
     sourceRepo:
       org: devstream-io
-      repo: dtm-repo-scaffolding-python
-      repoType: github
-    vars:
-      imageRepo: [[ dockerUser ]]/[[ app ]]
-- name: githubactions-python
-  instanceID: default
+      name: dtm-scaffolding-flask
+      scmType: github
+- name: github-actions
+  instanceID: flask
   dependsOn: [ repo-scaffolding.myapp ]
   options:
-    owner: [[ githubUser ]]
-    repo:  [[ app ]]
-    language:
-      name: python
-    branch: main
-    docker:
-      registry:
-        type: dockerhub
-        username: [[ dockerUser ]]
-        repository: [[ app ]]
+    scm:
+      owner: [[ githubUser ]]
+      name:  [[ app ]]
+      scmType: github
+    pipeline:
+      configLocation: https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml
+      language:
+        name: python
+        framework: flask
+      imageRepo:
+        user: [[ dockerUser ]]
 - name: helm-installer
   instanceID: argocd
 - name: argocdapp
   instanceID: default
-  dependsOn: [ "helm-installer.argocd", "githubactions-python.default" ]
+  dependsOn: [ "helm-installer.argocd", "github-actions.flask" ]
   options:
     app:
       name: [[ app ]]
@@ -177,6 +176,8 @@ tools:
       valuefile: values.yaml
       path: helm/[[ app ]]
       repoURL: ${{repo-scaffolding.myapp.outputs.repoURL}}
+    imageRepo:
+      user: [[ dockerUser ]]
 ```
 
 按需修改 `config.yaml` 文件中的 `vars` 部分。记得修改 `githubUser` 和 `dockerUser` 的值为你自己的用户名。
@@ -194,14 +195,14 @@ tools:
 
 ```bash
 export GITHUB_TOKEN="YOUR_GITHUB_TOKEN_HERE"
-export DOCKERHUB_TOKEN="YOUR_DOCKERHUB_TOKEN_HERE"
+export IMAGE_REPO_PASSWORD="YOUR_DOCKERHUB_TOKEN_HERE"
 ```
 
 > 提示：
 > 如果你不知道如何创建这两个 token，可以参考：
 > 
 > - GITHUB_TOKEN：[Manage API tokens for your Atlassian account](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
-> - DOCKERHUB_TOKEN：[Manage access tokens](https://docs.docker.com/docker-hub/access-tokens/)
+> - IMAGE_REPO_PASSWORD：[Manage access tokens](https://docs.docker.com/docker-hub/access-tokens/)
 
 ---
 
@@ -240,7 +241,7 @@ export DOCKERHUB_TOKEN="YOUR_DOCKERHUB_TOKEN_HERE"
 2022-12-05 17:49:49 ℹ [INFO]  Using local backend. State file: devstream.state.
 2022-12-05 17:49:49 ℹ [INFO]  Tool (repo-scaffolding/myapp) found in config but doesn't exist in the state, will be created.
 2022-12-05 17:49:49 ℹ [INFO]  Tool (helm-installer/argocd) found in config but doesn't exist in the state, will be created.
-2022-12-05 17:49:49 ℹ [INFO]  Tool (githubactions-python/default) found in config but doesn't exist in the state, will be created.
+2022-12-05 17:49:49 ℹ [INFO]  Tool (github-actions/flask) found in config but doesn't exist in the state, will be created.
 2022-12-05 17:49:49 ℹ [INFO]  Tool (argocdapp/default) found in config but doesn't exist in the state, will be created.
 2022-12-05 17:49:49 ℹ [INFO]  Start executing the plan.
 2022-12-05 17:49:49 ℹ [INFO]  Changes count: 4.
@@ -338,7 +339,7 @@ kubectl port-forward -n default svc/helloworld 8080:80
 2022-12-05 17:59:25 ℹ [INFO]  Delete started.
 2022-12-05 17:59:26 ℹ [INFO]  Using local backend. State file: devstream.state.
 2022-12-05 17:59:26 ℹ [INFO]  Tool (argocdapp/default) will be deleted.
-2022-12-05 17:59:26 ℹ [INFO]  Tool (githubactions-python/default) will be deleted.
+2022-12-05 17:59:26 ℹ [INFO]  Tool (github-actions/flask) will be deleted.
 2022-12-05 17:59:26 ℹ [INFO]  Tool (repo-scaffolding/myapp) will be deleted.
 2022-12-05 17:59:26 ℹ [INFO]  Tool (helm-installer/argocd) will be deleted.
 2022-12-05 17:59:26 ℹ [INFO]  Start executing the plan.

cmd/plugin/githubactions-python/main.go

@@ -25,7 +25,7 @@ This can be used to pre-download the plugin to use `dtm` in an **offline environ
 
 command: 
 
-- download specify plugins. e.g. `dtm init --download-only --plugins="repo-scaffolding, githubactions-golang" -d=.devstream/plugins`
+- download specify plugins. e.g. `dtm init --download-only --plugins="repo-scaffolding, github-actions" -d=.devstream/plugins`
 - download all plugins. e.g. `dtm init --download-only --all -d=.devstream/plugins`
 
 ## Init Logic

docs/best-practices/gitops.md

@@ -25,7 +25,7 @@
 
 **命令：**
 
-- 下载指定插件，如：`dtm init --download-only --plugins="repo-scaffolding, githubactions-golang" -d=.devstream/plugins`。 
+- 下载指定插件，如：`dtm init --download-only --plugins="repo-scaffolding, github-actions" -d=.devstream/plugins`。 
 - 下载所有插件，如：`dtm init --download-only --all -d=.devstream/plugins`。