fix: ensure proper commit history for the release branch (dapr#4018)

Author: JoshVanL

.build-tools/pkg/metadataschema/schema.go

@@ -20,7 +20,7 @@ type ComponentMetadata struct {
 	// Version of the component metadata schema.
 	SchemaVersion string `json:"schemaVersion" yaml:"schemaVersion" jsonschema:"enum=v1"`
 	// Component type, of one of the allowed values.
-	Type string `json:"type" yaml:"type" jsonschema:"enum=bindings,enum=state,enum=secretstores,enum=pubsub,enum=workflows,enum=configuration,enum=lock,enum=middleware,enum=crypto,enum=conversation"`
+	Type string `json:"type" yaml:"type" jsonschema:"enum=bindings,enum=state,enum=secretstores,enum=pubsub,enum=workflows,enum=configuration,enum=lock,enum=middleware,enum=crypto,enum=nameresolution,enum=conversation"`
 	// Name of the component (without the inital type, e.g. "http" instead of "bindings.http").
 	Name string `json:"name" yaml:"name"`
 	// Version of the component, with the leading "v", e.g. "v1".

.github/infrastructure/docker-compose-cassandra.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
   cassandra:
-    image: docker.io/bitnami/cassandra:4.0.1
+    image: docker.io/bitnami/cassandra:4.1
     ports:
       - '7000:7000'
       - '9042:9042'

bindings/apns/metadata.yaml

@@ -33,8 +33,8 @@ authenticationProfiles:
         description: "The APNS private key (P8 file content)"
 metadata:
   - name: development
-    type: boolean
+    type: bool
     required: false
     description: "The APNS environment is development or not"
-    example: true
-    default: false
+    example: "true"
+    default: "false"

bindings/gcp/bucket/bucket.go

@@ -47,8 +47,9 @@ const (
 	metadataEncodeBase64 = "encodeBase64"
 	metadataSignTTL      = "signTTL"
 
-	metadataKey = "key"
-	maxResults  = 1000
+	metadataContentType = "contentType"
+	metadataKey         = "key"
+	maxResults          = 1000
 
 	metadataKeyBC    = "name"
 	signOperation    = "sign"
@@ -77,6 +78,7 @@ type gcpMetadata struct {
 	TokenURI            string `json:"token_uri" mapstructure:"tokenURI" mdignore:"true" mapstructurealiases:"token_uri"`
 	AuthProviderCertURL string `json:"auth_provider_x509_cert_url" mapstructure:"authProviderX509CertURL" mdignore:"true" mapstructurealiases:"auth_provider_x509_cert_url"`
 	ClientCertURL       string `json:"client_x509_cert_url" mapstructure:"clientX509CertURL" mdignore:"true" mapstructurealiases:"client_x509_cert_url"`
+	ContentType         string `json:"contentType,omitempty" mapstructure:"contentType"`
 
 	Bucket       string `json:"bucket" mapstructure:"bucket"`
 	DecodeBase64 bool   `json:"decodeBase64,string" mapstructure:"decodeBase64"`
@@ -233,6 +235,12 @@ func (g *GCPStorage) create(ctx context.Context, req *bindings.InvokeRequest) (*
 	}
 
 	h := g.client.Bucket(g.metadata.Bucket).Object(name).NewWriter(ctx)
+
+	// Set content type if provided
+	if metadata.ContentType != "" {
+		h.ContentType = metadata.ContentType
+	}
+
 	// Cannot do `defer h.Close()` as Close() will flush the bytes and need to have error handling.
 	if _, err = io.Copy(h, r); err != nil {
 		cerr := h.Close()
@@ -378,9 +386,15 @@ func (metadata gcpMetadata) mergeWithRequestMetadata(req *bindings.InvokeRequest
 	if val, ok := req.Metadata[metadataEncodeBase64]; ok && val != "" {
 		merged.EncodeBase64 = strings.IsTruthy(val)
 	}
+
 	if val, ok := req.Metadata[metadataSignTTL]; ok && val != "" {
 		merged.SignTTL = val
 	}
+
+	if val, ok := req.Metadata[metadataContentType]; ok && val != "" {
+		merged.ContentType = val
+	}
+
 	return merged, nil
 }
 

bindings/gcp/bucket/bucket_test.go

@@ -233,6 +233,42 @@ func TestMergeWithRequestMetadata(t *testing.T) {
 		assert.NotNil(t, mergedMeta)
 		assert.False(t, mergedMeta.EncodeBase64)
 	})
+
+	t.Run("Has merged contentType metadata", func(t *testing.T) {
+		m := bindings.Metadata{}
+		m.Properties = map[string]string{
+			"bucket":      "my_bucket",
+			"projectID":   "my_project_id",
+			"contentType": "text/plain",
+		}
+		gs := GCPStorage{logger: logger.NewLogger("test")}
+		meta, err := gs.parseMetadata(m)
+		require.NoError(t, err)
+		assert.Equal(t, "text/plain", meta.ContentType)
+
+		// Empty request doesn't override
+		request := bindings.InvokeRequest{}
+		request.Metadata = map[string]string{}
+		mergedMeta, err := meta.mergeWithRequestMetadata(&request)
+		require.NoError(t, err)
+		assert.Equal(t, "text/plain", mergedMeta.ContentType)
+
+		// Request overrides component
+		request.Metadata = map[string]string{
+			"contentType": "text/csv",
+		}
+		mergedMeta, err = meta.mergeWithRequestMetadata(&request)
+		require.NoError(t, err)
+		assert.Equal(t, "text/csv", mergedMeta.ContentType)
+
+		// Empty string doesn't override
+		request.Metadata = map[string]string{
+			"contentType": "",
+		}
+		mergedMeta, err = meta.mergeWithRequestMetadata(&request)
+		require.NoError(t, err)
+		assert.Equal(t, "text/plain", mergedMeta.ContentType)
+	})
 }
 
 func TestInit(t *testing.T) {

bindings/gcp/bucket/metadata.yaml

@@ -44,4 +44,12 @@ metadata:
     description: |
       Configuration to encode base64 file content before return the content. 
       (In case of saving a file with binary content).
-    example: '"true, false"'
+    example: '"true, false"'
+  - name: contentType
+    type: string
+    required: false
+    description: |
+      The MIME type of the object being stored. If not specified, GCS will attempt to 
+      auto-detect the type, which may default to application/octet-stream or text/plain.
+      Common values include text/csv, application/json, image/png, etc.
+    example: '"text/csv", "application/json"'

bindings/kubemq/metadata.yaml

@@ -37,20 +37,20 @@ metadata:
     description: The KubeMQ channel name.
     example: "my-channel"
   - name: pollMaxItems
-    type: int
+    type: number
     required: false
     description: The maximum number of items to poll.
-    example: 10
-    default: 1
+    example: "10"
+    default: "1"
   - name: pollTimeoutSeconds
-    type: int
+    type: number
     required: false
     description: The timeout in seconds for polling.
-    example: 3600
-    default: 3600
+    example: "3600"
+    default: "3600"
   - name: autoAcknowledged
     type: bool
     required: false
     description: Whether to automatically acknowledge messages.
-    example: true
-    default: false
+    example: "true"
+    default: "false"

bindings/mqtt3/metadata.yaml

@@ -50,13 +50,13 @@ metadata:
   - name: retain
     required: false
     description: "Whether to retain messages"
-    example: false
-    default: false
+    example: "false"
+    default: "false"
   - name: cleanSession
     required: false
     description: "Whether to use clean session"
-    example: true
-    default: true
+    example: "true"
+    default: "true"
   - name: backOffMaxRetries
     required: false
     description: "Maximum retries for backoff"

bindings/rethinkdb/statechange/metadata.yaml

@@ -51,8 +51,8 @@ authenticationProfiles:
         type: bool
         required: false
         description: Whether to enable TLS encryption.
-        example: false
-        default: false
+        example: "false"
+        default: "false"
       - name: clientCert
         type: string
         required: true
@@ -75,8 +75,8 @@ metadata:
     type: bool
     required: false
     description: Whether to archive changes to a separate table.
-    example: false
-    default: false
+    example: "false"
+    default: "false"
   - name: timeout
     type: string
     required: false
@@ -86,13 +86,13 @@ metadata:
     type: bool
     required: false
     description: Whether to use json.Number instead of float64.
-    example: false
-    default: false
+    example: "false"
+    default: "false"
   - name: numRetries
     type: number
     required: false
     description: Number of times to retry queries on connection errors.
-    example: 3
+    example: "3"
   - name: hostDecayDuration
     type: string
     required: false
@@ -103,8 +103,8 @@ metadata:
     type: bool
     required: false
     description: Whether to enable opentracing for queries.
-    example: false
-    default: false
+    example: "false"
+    default: "false"
   - name: writeTimeout
     type: string
     required: false
@@ -119,7 +119,7 @@ metadata:
     type: number
     required: false
     description: Handshake version for RethinkDB."
-    example: 1
+    example: "1"
   - name: keepAlivePeriod
     type: string
     required: false
@@ -129,7 +129,7 @@ metadata:
     type: number
     required: false
     description: Maximum number of idle connections."
-    example: 5
+    example: "5"
   - name: authKey
     type: string
     required: false
@@ -140,17 +140,17 @@ metadata:
     type: number
     required: false
     description: Initial connection pool capacity."
-    example: 5
+    example: "5"
   - name: maxOpen
     type: number
     required: false
     description: Maximum number of open connections."
-    example: 10
+    example: "10"
   - name: discoverHosts
     type: bool
     required: false
     description: Whether to discover hosts."
-    example: false
+    example: "false"
   - name: nodeRefreshInterval
     type: string
     required: false

bindings/sftp/metadata.yaml

@@ -75,5 +75,5 @@ metadata:
   - name: insecureIgnoreHostKey
     required: false
     description: "Skip host key verification (insecure)"
-    example: false
-    default: false
+    example: "false"
+    default: "false"