CLOUDP-322242: Add Service account curl example to OAS

Author: andreaangiolillo

.github/scripts/split_spec.sh

@@ -2,7 +2,7 @@
 set -eou pipefail
 
 echo "Running FOAS CLI versions command"
-foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable  --stability-level preview
+foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable  --stability-level preview --stability-level upcoming
 
 echo "Running FOAS CLI split command with the following --env=${target_env:?} and -o=./openapi/v2/openapi.json"
 

tools/cli/internal/openapi/filter/code_sample.go

@@ -54,7 +54,7 @@ func (f *CodeSampleFilter) Apply() error {
 	return nil
 }
 
-func (f *CodeSampleFilter) newCurlCodeSamplesForOperation(pathName, opMethod string) codeSample {
+func (f *CodeSampleFilter) newDigestCurlCodeSamplesForOperation(pathName, opMethod string) codeSample {
 	version := apiVersion(f.metadata.targetVersion)
 	source := "curl --user \"{PUBLIC-KEY}:{PRIVATE-KEY}\" \\\n  --digest \\\n  " +
 		"--header \"Accept: application/vnd.atlas." + version + "+json\" \\\n  "
@@ -72,7 +72,30 @@ func (f *CodeSampleFilter) newCurlCodeSamplesForOperation(pathName, opMethod str
 
 	return codeSample{
 		Lang:   "cURL",
-		Label:  "curl",
+		Label:  "curl (Digest)",
+		Source: source,
+	}
+}
+
+func (f *CodeSampleFilter) newServiceAccountCurlCodeSamplesForOperation(pathName, opMethod string) codeSample {
+	version := apiVersion(f.metadata.targetVersion)
+	source := "curl --header \"Authorization: Bearer {ACCESS-TOKEN}\" \\\n  " +
+		"--header \"Accept: application/vnd.atlas." + version + "+json\" \\\n  "
+
+	switch opMethod {
+	case "GET":
+		source += "-X " + opMethod + " \"https://cloud.mongodb.com" + pathName + "?pretty=true\""
+	case "DELETE":
+		source += "-X " + opMethod + " \"https://cloud.mongodb.com" + pathName + "\""
+	case "POST", "PATCH", "PUT":
+		source += "--header \"Content-Type: application/vnd.atlas." + version + "+json\" \\\n  "
+		source += "-X " + opMethod + " \"https://cloud.mongodb.com" + pathName + "\" \\\n  "
+		source += "-d " + "'{ <Payload> }'"
+	}
+
+	return codeSample{
+		Lang:   "cURL",
+		Label:  "curl (Service Account)",
 		Source: source,
 	}
 }
@@ -108,7 +131,8 @@ func (f *CodeSampleFilter) includeCodeSamplesForOperation(pathName, opMethod str
 	}
 
 	op.Extensions[codeSampleExtensionName] = []codeSample{
-		f.newCurlCodeSamplesForOperation(pathName, opMethod),
+		f.newServiceAccountCurlCodeSamplesForOperation(pathName, opMethod),
+		f.newDigestCurlCodeSamplesForOperation(pathName, opMethod),
 		newAtlasCliCodeSamplesForOperation(op),
 	}
 	return nil

tools/cli/internal/openapi/filter/code_sample_test.go

@@ -78,7 +78,13 @@ func TestCodeSampleFilter(t *testing.T) {
 							"x-codeSamples": []codeSample{
 								{
 									Lang:  "cURL",
-									Label: "curl",
+									Label: "curl (Service Account)",
+									Source: "curl --header \"Authorization: Bearer {ACCESS-TOKEN}\" \\\n  " +
+										"--header \"Accept: application/vnd.atlas.2025-01-01+json\" \\\n  " + "-X GET \"https://cloud.mongodb.com/test?pretty=true\"",
+								},
+								{
+									Lang:  "cURL",
+									Label: "curl (Digest)",
 									Source: "curl --user \"{PUBLIC-KEY}:{PRIVATE-KEY}\" \\\n  --digest \\\n  " +
 										"--header \"Accept: application/vnd.atlas.2025-01-01+json\" \\\n  " + "-X GET \"https://cloud.mongodb.com/test?pretty=true\"",
 								},
@@ -141,7 +147,13 @@ func TestCodeSampleFilter(t *testing.T) {
 							"x-codeSamples": []codeSample{
 								{
 									Lang:  "cURL",
-									Label: "curl",
+									Label: "curl (Service Account)",
+									Source: "curl --header \"Authorization: Bearer {ACCESS-TOKEN}\" \\\n  " +
+										"--header \"Accept: application/vnd.atlas.preview+json\" \\\n  " + "-X GET \"https://cloud.mongodb.com/test?pretty=true\"",
+								},
+								{
+									Lang:  "cURL",
+									Label: "curl (Digest)",
 									Source: "curl --user \"{PUBLIC-KEY}:{PRIVATE-KEY}\" \\\n  --digest \\\n  " +
 										"--header \"Accept: application/vnd.atlas.preview+json\" \\\n  " + "-X GET \"https://cloud.mongodb.com/test?pretty=true\"",
 								},
@@ -204,7 +216,13 @@ func TestCodeSampleFilter(t *testing.T) {
 							"x-codeSamples": []codeSample{
 								{
 									Lang:  "cURL",
-									Label: "curl",
+									Label: "curl (Service Account)",
+									Source: "curl --header \"Authorization: Bearer {ACCESS-TOKEN}\" \\\n  " +
+										"--header \"Accept: application/vnd.atlas.2025-01-01.upcoming+json\" \\\n  " + "-X GET \"https://cloud.mongodb.com/test?pretty=true\"",
+								},
+								{
+									Lang:  "cURL",
+									Label: "curl (Digest)",
 									Source: "curl --user \"{PUBLIC-KEY}:{PRIVATE-KEY}\" \\\n  --digest \\\n  " +
 										"--header \"Accept: application/vnd.atlas.2025-01-01.upcoming+json\" \\\n  " + "-X GET \"https://cloud.mongodb.com/test?pretty=true\"",
 								},