Release/1.4.0

Makefile

@@ -1,14 +1,14 @@
 .PHONY: build clean ui
 
-VERSION=1.3.6
+VERSION=1.4.0
 BIN=answer
 DIR_SRC=./cmd/answer
 DOCKER_CMD=docker
 
 GO_ENV=CGO_ENABLED=0 GO111MODULE=on
 Revision=$(shell git rev-parse --short HEAD 2>/dev/null || echo "")
 GO_FLAGS=-ldflags="-X github.com/apache/incubator-answer/cmd.Version=$(VERSION) -X 'github.com/apache/incubator-answer/cmd.Revision=$(Revision)' -X 'github.com/apache/incubator-answer/cmd.Time=`date +%s`' -extldflags -static"
-GO=$(GO_ENV) $(shell which go)
+GO=$(GO_ENV) "$(shell which go)"
 
 build: generate
 	@$(GO) build $(GO_FLAGS) -o $(BIN) $(DIR_SRC)
@@ -23,6 +23,8 @@ universal: generate
 generate:
 	@$(GO) get github.com/google/wire/cmd/wire@v0.5.0
 	@$(GO) get github.com/golang/mock/mockgen@v1.6.0
+	@$(GO) get github.com/swaggo/swag/cmd/swag@v1.16.3
+	@$(GO) install github.com/swaggo/swag/cmd/swag@v1.16.3
 	@$(GO) install github.com/google/wire/cmd/wire@v0.5.0
 	@$(GO) install github.com/golang/mock/mockgen@v1.6.0
 	@$(GO) generate ./...

README.md

@@ -23,7 +23,7 @@ To learn more about the project, visit [answer.apache.org](https://answer.apache
 ### Running with docker
 
 ```bash
-docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:1.3.6
+docker run -d -p 9080:80 -v answer-data:/data --name answer apache/answer:1.4.0
 ```
 
 For more information, see [Installation](https://answer.apache.org/docs/installation).

charts/templates/pvc.yaml

@@ -20,7 +20,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ include "answer.fullname" . }}-claim
-  {{- with .Values.persistence.annotations  }}
+  {{- with .Values.persistence.annotations }}
   annotations:
     {{ toYaml . | indent 4 }}
   {{- end }}
@@ -39,4 +39,10 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
+  {{- with .Values.persistence.dataSource }}
+  dataSource:
+    name: {{ .name }}
+    kind: {{ .kind | default "VolumeSnapshot" }}
+    apiGroup: {{ .apiGroup | default "snapshot.storage.k8s.io" }}
+  {{- end }}
 {{- end }}

charts/values.yaml

@@ -68,7 +68,7 @@ env:
 
 # Configure extra containers
 extraContainers: []
-  # - name: cloudsql-proxy 
+  # - name: cloudsql-proxy
   #   image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.1.2
   #   command:
   #     - /cloud-sql-proxy
@@ -91,6 +91,12 @@ persistence:
   accessMode: ReadWriteOnce
   size: 5Gi
   annotations: {}
+  # To restore a PVC from a VolumeSnapshot, set the dataSource;
+  # the kind and apiGroup are optional and default to the shown values
+  dataSource: {}
+    # name: my-volume-snapshot
+    # kind: VolumeSnapshot
+    # apiGroup: snapshot.storage.k8s.io
 
 imagePullSecrets: []
 nameOverride: ""

cmd/answer/main.go

@@ -17,12 +17,19 @@
  * under the License.
  */
 
+//go:generate go run github.com/swaggo/swag/cmd/swag init -g ./cmd/answer/main.go -d ../../ -o ../../docs
+
 package main
 
 import (
 	answercmd "github.com/apache/incubator-answer/cmd"
 )
 
+// main godoc
+// @title 	"apache answer"
+// @description = "apache answer api"
+// @version = "v0.0.1"
+// @BasePath = "/"
 // @securityDefinitions.apikey ApiKeyAuth
 // @in header
 // @name Authorization

cmd/command.go

@@ -263,12 +263,17 @@ To run answer, use:
 			}
 
 			field := &cli.ConfigField{}
-			for _, f := range configFields {
-				switch f {
+			fmt.Println(configFields)
+			if len(configFields) > 0 {
+				switch configFields[0] {
 				case "allow_password_login":
 					field.AllowPasswordLogin = true
+				case "deactivate_plugin":
+					if len(configFields) > 1 {
+						field.DeactivatePluginSlugName = configFields[1]
+					}
 				default:
-					fmt.Printf("field %s not support\n", f)
+					fmt.Printf("field %s not support\n", configFields[0])
 				}
 			}
 			err = cli.SetDefaultConfig(c.Data.Database, c.Data.Cache, field)