Merge remote-tracking branch 'origin/master' into fixup_xmltree

Author: dsteeley

.github/workflows/samples-go-client.yaml

@@ -0,0 +1,31 @@
+name: Samples Go Clients
+
+on:
+  push:
+    paths:
+      - 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/**'
+  pull_request:
+    paths:
+      - 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/**'
+
+jobs:
+  build:
+    name: Build Go
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+      - run: go version
+      - name: Install Dependencies
+        working-directory: ${{ matrix.sample }}
+        run: |
+          go mod tidy
+      - name: Run test
+        working-directory: ${{ matrix.sample }}
+        run: go test -mod=mod -v
+

bin/configs/go-petstore-aws-signature.yaml

@@ -0,0 +1,10 @@
+generatorName: go
+outputDir: samples/openapi3/client/petstore/go/go-petstore-aws-signature
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml
+templateDir: modules/openapi-generator/src/main/resources/go
+additionalProperties:
+  enumClassPrefix: "true"
+  packageName: petstore
+  disallowAdditionalPropertiesIfNotPresent: false
+  withAWSV4Signature: true
+  

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java

@@ -787,21 +787,26 @@ private ExtendedCodegenModel processCodeGenModel(ExtendedCodegenModel cm) {
                 .map(CodegenComposedSchemas::getOneOf)
                 .orElse(Collections.emptyList());
 
+        // create a set of any non-primitive, non-array types used in the oneOf schemas which will
+        // need to be imported.
         cm.oneOfModels = oneOfsList.stream()
-                .filter(CodegenProperty::getIsModel)
+                .filter(cp -> !cp.getIsPrimitiveType() && !cp.getIsArray())
                 .map(CodegenProperty::getBaseType)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toCollection(TreeSet::new));
 
+        // create a set of any complex, inner types used by arrays in the oneOf schema (e.g. if
+        // the oneOf uses Array<Foo>, Foo needs to be imported).
         cm.oneOfArrays = oneOfsList.stream()
                 .filter(CodegenProperty::getIsArray)
                 .map(CodegenProperty::getComplexType)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toCollection(TreeSet::new));
 
+        // create a set of primitive types used in the oneOf schemas for use in the to & from
+        // typed JSON methods.
         cm.oneOfPrimitives = oneOfsList.stream()
                 .filter(CodegenProperty::getIsPrimitiveType)
-                .filter(Objects::nonNull)
                 .collect(Collectors.toCollection(HashSet::new));
 
         if (!cm.oneOf.isEmpty()) {
@@ -1485,6 +1490,9 @@ public class ExtendedCodegenModel extends CodegenModel {
         @Getter @Setter
         public Set<String> modelImports = new TreeSet<String>();
 
+        // oneOfModels, oneOfArrays & oneOfPrimitives contain a list of types used in schemas
+        // composed with oneOf and are used to define the import list and the to & from
+        // 'TypedJSON' conversion methods in the composed model classes.
         @Getter @Setter
         public Set<String> oneOfModels = new TreeSet<>();
         @Getter @Setter

modules/openapi-generator/src/main/resources/C-libcurl/CMakeLists.txt.mustache

@@ -91,7 +91,11 @@ include(PreTarget.cmake OPTIONAL)
 set(PROJECT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # Add library with project file with project name as library name
-add_library(${pkgName} ${SRCS} ${HDRS})
+if(NOT BUILD_STATIC_LIBS)
+  add_library(${pkgName} ${SRCS} ${HDRS})
+else()
+  add_library(${pkgName} STATIC ${SRCS} ${HDRS})
+endif()
 # Link dependent libraries
 if(NOT CMAKE_VERSION VERSION_LESS 3.4)
     target_link_libraries(${pkgName} PRIVATE OpenSSL::SSL OpenSSL::Crypto)

modules/openapi-generator/src/main/resources/C-libcurl/apiClient.c.mustache

@@ -11,6 +11,7 @@ apiClient_t *apiClient_create() {
     apiClient->basePath = strdup("{{{basePath}}}");
     apiClient->sslConfig = NULL;
     apiClient->curlConfig = NULL;
+    apiClient->curl_pre_invoke_func = NULL;
     apiClient->dataReceived = NULL;
     apiClient->dataReceivedLen = 0;
     apiClient->data_callback_func = NULL;
@@ -67,6 +68,7 @@ apiClient_t *apiClient_create_with_base_path(const char *basePath
     apiClient->curlConfig->keepidle = 120;
     apiClient->curlConfig->keepintvl = 60;
 
+    apiClient->curl_pre_invoke_func = NULL;
     apiClient->dataReceived = NULL;
     apiClient->dataReceivedLen = 0;
     apiClient->data_callback_func = NULL;
@@ -155,6 +157,8 @@ void apiClient_free(apiClient_t *apiClient) {
         apiClient->curlConfig = NULL;
     }
 
+    apiClient->curl_pre_invoke_func = NULL;
+
     free(apiClient);
 }
 
@@ -564,6 +568,10 @@ void apiClient_invoke(apiClient_t    *apiClient,
             curl_easy_setopt(handle, CURLOPT_VERBOSE, apiClient->curlConfig->verbose);
         }
 
+        if(apiClient->curl_pre_invoke_func) {
+            apiClient->curl_pre_invoke_func(handle);
+        }
+
         res = curl_easy_perform(handle);
 
         curl_slist_free_all(headers);

modules/openapi-generator/src/main/resources/C-libcurl/apiClient.h.mustache

@@ -32,6 +32,7 @@ typedef struct apiClient_t {
     char *basePath;
     sslConfig_t *sslConfig;
     curlConfig_t *curlConfig;
+    void (*curl_pre_invoke_func)(CURL *);
     void *dataReceived;
     long dataReceivedLen;
     void (*data_callback_func)(void **, long *);

modules/openapi-generator/src/main/resources/go/client.mustache

@@ -27,8 +27,10 @@ import (
 	"golang.org/x/oauth2"
 	{{/hasOAuthMethods}}
 	{{#withAWSV4Signature}}
-	awsv4 "github.com/aws/aws-sdk-go/aws/signer/v4"
-	awscredentials "github.com/aws/aws-sdk-go/aws/credentials"
+	awsv4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
+	awscredentials "github.com/aws/aws-sdk-go-v2/credentials"
+	"crypto/sha256"
+	"encoding/hex"
 	{{/withAWSV4Signature}}
 )
 
@@ -458,13 +460,10 @@ func (c *APIClient) prepareRequest(
 		{{#withAWSV4Signature}}
 		// AWS Signature v4 Authentication
 		if auth, ok := ctx.Value(ContextAWSv4).(AWSv4); ok {
-			creds := awscredentials.NewStaticCredentials(auth.AccessKey, auth.SecretKey, auth.SessionToken)
-			signer := awsv4.NewSigner(creds)
-			var reader *strings.Reader
-			if body == nil {
-				reader = strings.NewReader("")
-			} else {
-				reader = strings.NewReader(body.String())
+			credsProvider := awscredentials.NewStaticCredentialsProvider(auth.AccessKey, auth.SecretKey, auth.SessionToken)
+			creds, err := credsProvider.Retrieve(ctx)
+			if err != nil {
+				return nil, err
 			}
 
 			// Define default values for region and service to maintain backward compatibility
@@ -477,8 +476,22 @@ func (c *APIClient) prepareRequest(
 				service = "oapi"
 			}
 
-			timestamp := time.Now()
-			_, err := signer.Sign(localVarRequest, reader, service, region, timestamp)
+			// Compute payload hash from the request body
+			var payloadHash string
+			if body == nil {
+				// Empty body
+				hash := sha256.Sum256([]byte(""))
+				payloadHash = hex.EncodeToString(hash[:])
+			} else {
+				// Hash the actual body content
+				bodyBytes := []byte(body.String())
+				hash := sha256.Sum256(bodyBytes)
+				payloadHash = hex.EncodeToString(hash[:])
+			}
+
+			// Sign the request with the computed payload hash
+			signer := awsv4.NewSigner()
+			err = signer.SignHTTP(ctx, creds, localVarRequest, payloadHash, service, region, time.Now())
 			if err != nil {
 				return nil, err
 			}

modules/openapi-generator/src/main/resources/go/go.mod.mustache

@@ -8,7 +8,7 @@ require (
 	golang.org/x/oauth2 v0.27.0
 	{{/hasOAuthMethods}}
 	{{#withAWSV4Signature}}
-	github.com/aws/aws-sdk-go v1.34.14
+	github.com/aws/aws-sdk-go-v2 v1.37.0
 	{{/withAWSV4Signature}}
 	{{#importValidator}}
 	gopkg.in/validator.v2 v2.0.1

modules/openapi-generator/src/main/resources/rust-server-deprecated/Cargo.mustache

@@ -99,9 +99,6 @@ validator = { version = "0.16", features = ["derive"] }
 
 # Crates included if required by the API definition
 {{#usesXml}}
-# TODO: this should be updated to point at the official crate once
-# https://github.com/RReverser/serde-xml-rs/pull/45 is accepted upstream
-#serde-xml-rs = {git = "https://github.com/Metaswitch/serde-xml-rs" , branch = "master"}
 serde-xml-rs = "0.8"
 {{/usesXml}}
 {{#apiUsesMultipart}}

modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache

@@ -94,10 +94,8 @@ validator = { version = "0.20", features = ["derive"] }
 
 # Crates included if required by the API definition
 {{#usesXml}}
-# TODO: this should be updated to point at the official crate once
-# https://github.com/RReverser/serde-xml-rs/pull/45 is accepted upstream
-#serde-xml-rs = {git = "https://github.com/Metaswitch/serde-xml-rs" , branch = "master"}
-serde-xml-rs = "0.8"{{/usesXml}}
+serde-xml-rs = "0.8"
+{{/usesXml}}
 {{#apiUsesMultipartFormData}}
 multipart = { version = "0.18", default-features = false, optional = true }
 {{/apiUsesMultipartFormData}}