Change SDK config customHeaders format

2026-10-16 06:45:28 +00:00 · 2025-03-27 17:31:38 -03:00
parent 75ca093b24
commit e8ece6be3f
6 changed files with 129 additions and 73 deletions
@@ -35,69 +35,83 @@ func GetRestyClientWithCustomHeaders() (*resty.Client, error) {
 	httpClient := resty.New()
 	customHeaders := os.Getenv("INFISICAL_CUSTOM_HEADERS")
 	if customHeaders != "" {
-		headers := map[string]string{}
-
-		pos := 0
-		for pos < len(customHeaders) {
-			for pos < len(customHeaders) && unicode.IsSpace(rune(customHeaders[pos])) {
-				pos++
-			}
-
-			if pos >= len(customHeaders) {
-				break
-			}
-
-			keyStart := pos
-			for pos < len(customHeaders) && customHeaders[pos] != '=' && !unicode.IsSpace(rune(customHeaders[pos])) {
-				pos++
-			}
-
-			if pos >= len(customHeaders) || customHeaders[pos] != '=' {
-				return nil, fmt.Errorf("invalid custom header format. Expected \"headerKey1=value1 headerKey2=value2 ....\" but got %v", customHeaders)
-			}
-
-			key := customHeaders[keyStart:pos]
-			pos++
-
-			for pos < len(customHeaders) && unicode.IsSpace(rune(customHeaders[pos])) {
-				pos++
-			}
-
-			var value string
-
-			if pos < len(customHeaders) {
-				if customHeaders[pos] == '"' || customHeaders[pos] == '\'' {
-					quoteChar := customHeaders[pos]
-					pos++
-					valueStart := pos
-
-					for pos < len(customHeaders) &&
-						(customHeaders[pos] != quoteChar ||
-							(pos > 0 && customHeaders[pos-1] == '\\')) {
-						pos++
-					}
-
-					if pos < len(customHeaders) {
-						value = customHeaders[valueStart:pos]
-						pos++
-					} else {
-						value = customHeaders[valueStart:]
-					}
-				} else {
-					valueStart := pos
-					for pos < len(customHeaders) && !unicode.IsSpace(rune(customHeaders[pos])) {
-						pos++
-					}
-					value = customHeaders[valueStart:pos]
-				}
-			}
-
-			if key != "" && !strings.EqualFold(key, "User-Agent") && !strings.EqualFold(key, "Accept") {
-				headers[key] = value
-			}
+		headers, err := GetInfisicalCustomHeadersMap()
+		if err != nil {
+			return nil, err
 		}

 		httpClient.SetHeaders(headers)
 	}
 	return httpClient, nil
 }
+
+func GetInfisicalCustomHeadersMap() (map[string]string, error) {
+	customHeaders := os.Getenv("INFISICAL_CUSTOM_HEADERS")
+	if customHeaders == "" {
+		return nil, nil
+	}
+
+	headers := map[string]string{}
+
+	pos := 0
+	for pos < len(customHeaders) {
+		for pos < len(customHeaders) && unicode.IsSpace(rune(customHeaders[pos])) {
+			pos++
+		}
+
+		if pos >= len(customHeaders) {
+			break
+		}
+
+		keyStart := pos
+		for pos < len(customHeaders) && customHeaders[pos] != '=' && !unicode.IsSpace(rune(customHeaders[pos])) {
+			pos++
+		}
+
+		if pos >= len(customHeaders) || customHeaders[pos] != '=' {
+			return nil, fmt.Errorf("invalid custom header format. Expected \"headerKey1=value1 headerKey2=value2 ....\" but got %v", customHeaders)
+		}
+
+		key := customHeaders[keyStart:pos]
+		pos++
+
+		for pos < len(customHeaders) && unicode.IsSpace(rune(customHeaders[pos])) {
+			pos++
+		}
+
+		var value string
+
+		if pos < len(customHeaders) {
+			if customHeaders[pos] == '"' || customHeaders[pos] == '\'' {
+				quoteChar := customHeaders[pos]
+				pos++
+				valueStart := pos
+
+				for pos < len(customHeaders) &&
+					(customHeaders[pos] != quoteChar ||
+						(pos > 0 && customHeaders[pos-1] == '\\')) {
+					pos++
+				}
+
+				if pos < len(customHeaders) {
+					value = customHeaders[valueStart:pos]
+					pos++
+				} else {
+					value = customHeaders[valueStart:]
+				}
+			} else {
+				valueStart := pos
+				for pos < len(customHeaders) && !unicode.IsSpace(rune(customHeaders[pos])) {
+					pos++
+				}
+				value = customHeaders[valueStart:pos]
+			}
+		}
+
+		if key != "" && !strings.EqualFold(key, "User-Agent") && !strings.EqualFold(key, "Accept") {
+			headers[key] = value
+		}
+	}
+
+	return headers, nil
+}