Merge branch 'main' into v3

.github/workflows/main.yml

@@ -169,7 +169,7 @@ jobs:
 
     steps:
       - name: Slack Notification
-        uses: rtCamp/[email protected].1
+        uses: rtCamp/[email protected].2
 
   workflow_failure:
     if: ${{ failure() }}
@@ -187,4 +187,4 @@ jobs:
 
     steps:
       - name: Slack Notification
-        uses: rtCamp/[email protected].1
+        uses: rtCamp/[email protected].2

Makefile.include

@@ -1,5 +1,4 @@
 
-
 .PHONY: default init release gen test clean all
 default: help
 
@@ -37,7 +36,7 @@ gen: clean            ## Generate files
 	make format ## TODO: One formatting run is not enough, figure out why.
 	go install -v ./...
 
-clean: 			  ## Remove generated files
+clean:               ## Remove generated files
 	make -C api clean
 
 gen-mocks:

api/Makefile

@@ -57,7 +57,9 @@ gen:            ## Generate PMM API
 		platform/v1/json/v1.json
 	../bin/swagger validate swagger/swagger.json
 
-	../bin/swagger-order --output=swagger/swagger.json swagger/swagger.json
+	# It looks like the order is already correct, so no need to run this
+	# TODO: check if swagger-order can be removed
+	# ../bin/swagger-order --output=swagger/swagger.json swagger/swagger.json
 
 	# generate API spec with all PMM Server APIs (omit agentlocal)
 	../bin/swagger mixin --output=swagger/swagger-dev.json \
@@ -77,7 +79,8 @@ gen:            ## Generate PMM API
 
 	../bin/swagger validate swagger/swagger-dev.json
 
-	../bin/swagger-order --output=swagger/swagger-dev.json swagger/swagger-dev.json
+	# It looks like the order is already correct, so no need to run this
+	# ../bin/swagger-order --output=swagger/swagger-dev.json swagger/swagger-dev.json
 
 format:               ## Format API definitions
 	../bin/buf format . -w
@@ -124,4 +127,4 @@ clean: clean-swagger  ## Remove generated files
 	rm -f swagger/swagger.json swagger/swagger-dev.json
 
 descriptors:          ## Update API compatibility descriptors
-	../bin/buf build -o descriptor.bin --as-file-descriptor-set .
+	../bin/buf build -o descriptor.bin --as-file-descriptor-set .