airflow: Remove ? when none of the query param values are set

cloud-barista · Nov 13, 2024 · 3d5fe6d · 3d5fe6d
1 parent a374505
commit 3d5fe6d
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/lib/airflow/gusty.go b/lib/airflow/gusty.go
@@ -80,16 +80,23 @@ func parseEndpoint(pathParams map[string]string, queryParams map[string]string,
 
 	queryParamKeys := reflect.ValueOf(pathParams).MapKeys()
 	if len(queryParamKeys) > 0 {
-		if !strings.Contains(endpoint, "?") {
-			endpoint += "?"
-		}
+		var queryParamsString string
+
 		for _, key := range queryParamKeys {
 			if queryParams[key.String()] == "" {
 				continue
 			}
-			endpoint += fmt.Sprintf("%v=%v&", key.String(), queryParams[key.String()])
+			queryParamsString += fmt.Sprintf("%v=%v&", key.String(), queryParams[key.String()])
+		}
+
+		if queryParamsString != "" {
+			queryParamsString = strings.TrimRight(queryParamsString, "&")
+
+			if !strings.HasSuffix(endpoint, "?") {
+				endpoint += "?"
+			}
+			endpoint += queryParamsString
 		}
-		endpoint = strings.TrimRight(endpoint, "&")
 	}
 
 	return endpoint, nil