Merge branch 'main' into e2e

apache · Nov 22, 2023 · cbf0092 · cbf0092
2 parents 858952f + 2cf77ad
commit cbf0092
Show file tree

Hide file tree

Showing 20 changed files with 270 additions and 147 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -17,7 +17,7 @@
 
 # NOTE: All configurations could be found here: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
 github:
-  description: "A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Answer."
+  description: "A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer."
   homepage: https://answer.apache.org
   labels:
     - react

diff --git a/.github/workflows/build-image-for-release.yml b/.github/workflows/build-image-for-release.yml
@@ -51,10 +51,10 @@ jobs:
       uses: docker/setup-buildx-action@v2
 
     - name: Login to DockerHub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKERHUB_USER }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and push
       uses: docker/build-push-action@v4

diff --git a/.github/workflows/build-image-for-test.yml b/.github/workflows/build-image-for-test.yml
@@ -44,10 +44,10 @@ jobs:
       uses: docker/setup-buildx-action@v2
 
     - name: Login to DockerHub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKERHUB_USER }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and push
       uses: docker/build-push-action@v4

diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ LABEL maintainer="aichy@sf.com"
 
 ARG GOPROXY
 # ENV GOPROXY ${GOPROXY:-direct}
-ENV GOPROXY=https://proxy.golang.com.cn,direct
+# ENV GOPROXY=https://proxy.golang.com.cn,direct
 
 ENV GOPATH /go
 ENV GOROOT /usr/local/go

diff --git a/Makefile b/Makefile
@@ -48,4 +48,8 @@ install-ui-packages:
 ui:
 	@cd ui && pnpm pre-install && pnpm build && cd -
 
+lint: generate
+	@bash ./script/check-asf-header.sh
+	@gofmt -w -l .
+
 all: clean build
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
     <img alt="logo" src="docs/img/logo.svg" height="99px">
 </a>
 
-# Answer - Build Q&A platform
+# Apache Answer - Build Q&A platform
 
 A Q&A platform software for teams at any scales. Whether it’s a community forum, help center, or knowledge management platform, you can always count on Answer.
 
@@ -36,6 +36,19 @@ We value your feedback and suggestions to improve our documentation. If you have
 
 You can also check out the [plugins here](https://github.com/apache/incubator-answer-plugins).
 
+## Building from Source
+
+### Prerequisites
+- Golang >= 1.18
+- Node.js >= 16.17
+- pnpm >= 8
+
+### Build
+```bash
+$ make ui
+$ make build
+```
+
 ## Contributing
 
 Contributions are always welcome!

diff --git a/SECURITY.md b/SECURITY.md
diff --git a/charts/templates/hpa.yaml b/charts/templates/hpa.yaml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- if .Values.autoscaling.enabled }}
+{{ if .Values.autoscaling.enabled -}}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:

diff --git a/charts/templates/ingress.yaml b/charts/templates/ingress.yaml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- if .Values.ingress.enabled -}}
+{{ if .Values.ingress.enabled -}}
 {{- $fullName := include "answer.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}

diff --git a/charts/templates/pvc.yaml b/charts/templates/pvc.yaml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- if .Values.persistence.enabled }}
+{{ if .Values.persistence.enabled -}}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:

diff --git a/charts/templates/serviceaccount.yaml b/charts/templates/serviceaccount.yaml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- if .Values.serviceAccount.create -}}
+{{ if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/go.mod b/go.mod
@@ -86,7 +86,6 @@ require (
 	github.com/golang/geo v0.0.0-20190812012225-f41920e961ce // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/subcommands v1.0.1 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect

diff --git a/go.sum b/go.sum
@@ -316,7 +316,6 @@ github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbu
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

diff --git a/internal/service/mock/siteinfo_repo_mock.go b/internal/service/mock/siteinfo_repo_mock.go
diff --git a/licenserc.toml b/licenserc.toml
@@ -17,6 +17,24 @@
 
 headerPath = "Apache-2.0-ASF.txt"
 
+excludes = [
+  "docs/release/**",
+  "ui/build/**",
+  "answer-data/**",
+  "NOTICE",
+  "DISCLAIMER",
+  "Makefile",
+  "go.mod",
+  "go.sum",
+  "ui/.eslintignore",
+  "ui/.browserslistrc",
+  "ui/.npmrc",
+  "ui/.env.*",
+  "script/plugin_list",
+  "charts/templates/_helpers.tpl",
+  "charts/.helmignore",
+]
+
 [properties]
 inceptionYear = 2023
 copyrightOwner = "tison <wander4096@gmail.com>"