secure value update

pkg/apis/datasource/v0alpha1/config.go

@@ -15,13 +15,18 @@ type GenericDataSource struct {
 	Spec GenericDataSourceSpec `json:"spec"`
 
 	// Secure values placeholder (true for fields that exist)
-	Secure map[string]bool `json:"secure,omitempty"`
+	Secure map[string]SecureValue `json:"secure,omitempty"`
+}
 
-	// // swagger:ignore
-	// Password string `json:"-"`
+type SecureValue struct {
+	// The input is only valid for writing the value -- it is replaced on read
+	Input string `json:"input,omitempty"`
 
-	// // swagger:ignore
-	// BasicAuthPassword string `json:"-"`
+	// The name identifier for this secure value
+	Reference string `json:"ref,omitempty"`
+
+	// Value for write, this will remove the secret value
+	Remove bool `json:"remove,omitempty"`
 }
 
 // DsAccess represents how the datasource connects to the remote service

pkg/apis/datasource/v0alpha1/zz_generated.deepcopy.go

@@ -78,7 +78,7 @@ func (in *GenericDataSource) DeepCopyInto(out *GenericDataSource) {
 	in.Spec.DeepCopyInto(&out.Spec)
 	if in.Secure != nil {
 		in, out := &in.Secure, &out.Secure
-		*out = make(map[string]bool, len(*in))
+		*out = make(map[string]SecureValue, len(*in))
 		for key, val := range *in {
 			(*out)[key] = val
 		}
@@ -182,3 +182,19 @@ func (in *HealthCheckResult) DeepCopyObject() runtime.Object {
 	}
 	return nil
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SecureValue) DeepCopyInto(out *SecureValue) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecureValue.
+func (in *SecureValue) DeepCopy() *SecureValue {
+	if in == nil {
+		return nil
+	}
+	out := new(SecureValue)
+	in.DeepCopyInto(out)
+	return out
+}

pkg/apis/datasource/v0alpha1/zz_generated.openapi.go

@@ -20,6 +20,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.GenericDataSourceList":    schema_pkg_apis_datasource_v0alpha1_GenericDataSourceList(ref),
 		"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.GenericDataSourceSpec":    schema_pkg_apis_datasource_v0alpha1_GenericDataSourceSpec(ref),
 		"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.HealthCheckResult":        schema_pkg_apis_datasource_v0alpha1_HealthCheckResult(ref),
+		"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.SecureValue":              schema_pkg_apis_datasource_v0alpha1_SecureValue(ref),
 	}
 }
 
@@ -162,9 +163,8 @@ func schema_pkg_apis_datasource_v0alpha1_GenericDataSource(ref common.ReferenceC
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: false,
-										Type:    []string{"boolean"},
-										Format:  "",
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.SecureValue"),
 									},
 								},
 							},
@@ -175,7 +175,7 @@ func schema_pkg_apis_datasource_v0alpha1_GenericDataSource(ref common.ReferenceC
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.GenericDataSourceSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.GenericDataSourceSpec", "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1.SecureValue", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
 	}
 }
 
@@ -367,3 +367,36 @@ func schema_pkg_apis_datasource_v0alpha1_HealthCheckResult(ref common.ReferenceC
 			"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured"},
 	}
 }
+
+func schema_pkg_apis_datasource_v0alpha1_SecureValue(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"input": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The input is only valid for writing the value -- it is replaced on read",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"ref": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The name identifier for this secure value",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"remove": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Value for write, this will remove the secret value",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}

pkg/apis/datasource/v0alpha1/zz_generated.openapi_violation_exceptions.list

@@ -1,2 +1,3 @@
 API rule violation: names_match,github.com/grafana/grafana/pkg/apis/datasource/v0alpha1,GenericDataSourceSpec,User
+API rule violation: names_match,github.com/grafana/grafana/pkg/apis/datasource/v0alpha1,SecureValue,Reference
 API rule violation: streaming_list_type_json_tags,github.com/grafana/grafana/pkg/apis/datasource/v0alpha1,GenericDataSourceList,ListMeta