fix: if multi-line files not add " for {{ (#24)

* fix: if multi-line files not add " for {{

Signed-off-by: Sn0rt <wangguohao.2009@gmail.com>

* fix: udpate es-gen help output

Signed-off-by: Sn0rt <wangguohao.2009@gmail.com>

* fix: not skip all of the secret if first secret is no AVP

Signed-off-by: Sn0rt <wangguohao.2009@gmail.com>

* ci: update ci set Orphan as createPolicy

Signed-off-by: Sn0rt <wangguohao.2009@gmail.com>

---------

Signed-off-by: Sn0rt <wangguohao.2009@gmail.com>

Author: Sn0rt

cmd/secret2es.go

@@ -77,7 +77,7 @@ func extSecretGenCmd() *cobra.Command {
 	cmd.Flags().StringP("input", "i", "", "Input path of corev1 secret file (required)")
 	cmd.Flags().StringP("storetype", "s", "SecretStore", "Store type (optional)")
 	cmd.Flags().StringP("storename", "n", "", "Store name (required)")
-	cmd.Flags().StringP("creation-policy", "c", "Orphan", "Create policy (default: Orphan), only Owner, Orphan")
+	cmd.Flags().StringP("creation-policy", "c", "Owner", "Create policy, only Owner, Orphan")
 	cmd.Flags().BoolP("resolve", "r", false, "Resolve the <% ENV %> from env")
 
 	err := cmd.MarkFlagRequired("input")

e2e/e2e.sh

@@ -12,7 +12,7 @@ function build_secret2es() {
 }
 
 function generate_external_secret_template() {
-  ./secret2es es-gen -i e2e/templated.yaml -s ClusterSecretStore -n tenant-b > e2e/render.yaml
+  ./secret2es es-gen -i e2e/templated.yaml -s ClusterSecretStore -n tenant-b -c Orphan > e2e/render.yaml
   cat e2e/render.yaml
   return 0
 }

pkg/converter/secret_opaque.go

@@ -132,8 +132,12 @@ func generateEsByOpaqueSecret(inputSecret *internalSecret, storeType, storeName
 			if err != nil {
 				return nil, err
 			}
-			var newFileContent = addQuotesCurlyBraces(newFileContentWithoutQuote)
-			templateData[fileName] = newFileContent
+			if !strings.Contains(newFileContentWithoutQuote, "\n") {
+				var newFileContent = addQuotesCurlyBraces(newFileContentWithoutQuote)
+				templateData[fileName] = newFileContent
+			} else {
+				templateData[fileName] = newFileContentWithoutQuote
+			}
 		}
 	}
 

pkg/converter/secret_opaque_test.go

@@ -264,8 +264,8 @@ port = 4000`,
 							Data: map[string]string{
 								"mylogin.conf": `[client]
 host = example.com
-user = "{{ .USER }}"
-password = "{{ .MYSQL_PASSWD }}"
+user = {{ .USER }}
+password = {{ .MYSQL_PASSWD }}
 port = 4000`,
 							},
 						},
@@ -579,8 +579,8 @@ config:
 prefix: "test/ubuntu"
 config:
   endpoint: "https://s3.amazonaws.com"
-  access_key: "{{ .S3_ACCESS_KEY }}"
-  secret_key: "{{ .S3_SECRET_KEY }}"`,
+  access_key: {{ .S3_ACCESS_KEY }}
+  secret_key: {{ .S3_SECRET_KEY }}`,
 							},
 						},
 					},

pkg/converter/secretconvert.go

@@ -27,6 +27,10 @@ func ConvertSecret(inputFile, storeType, storeName string, creationPolicy esv1be
 		if err != nil {
 			switch err.Error() {
 			case fmt.Errorf(ErrCommonNotIncludeAngleBrackets, inputSecret.Name).Error():
+				_, _ = fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+				continue
+			case fmt.Errorf(ErrCommonEmptyAnnotations, inputSecret.Name).Error():
+				_, _ = fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 				continue
 			}
 			return fmt.Errorf("error converting secret to external secret: %s", err.Error())