Merge branch 'fix-tests-failing-due-to-incorrect-version' into 'develop'

ci: fix Go tests that internally check the version of a component

See merge request asapo/asapo!226

.gitlab-ci.yml

@@ -3,6 +3,9 @@ workflow:
   rules:
     - if: $CI_COMMIT_BRANCH
 
+variables:
+  GO_VERSION_FILE: $CI_PROJECT_DIR/common/go/src/asapo_common/version/version_lib.go
+
 include:
   - local: deploy/build_env/services-linux/gitlab-ci-build-docker.yml
   - local: deploy/build_env/services-windows/gitlab-ci-build-docker.yml
@@ -97,6 +100,8 @@ build-services-linux-debug:
     - cd $CI_PROJECT_DIR/build
     - cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_INTEGRATION_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_CONSUMER_TOOLS=ON -DENABLE_LIBFABRIC=ON -DENABLE_LIBFABRIC_LOCALHOST=ON -DBUILD_EVENT_MONITOR_PRODUCER=ON -DSTOP_BUILD_ON_WARNINGS=ON -DENABLE_NEW_RECEIVER_MONITORING=ON ..
     - make -j 4
+    # Ensures that the definition of versions of Go packages is present and will be uploaded.
+    - cat "$GO_VERSION_FILE"
   tags:
     - kubernetes-executor
   rules:
@@ -104,6 +109,7 @@ build-services-linux-debug:
   artifacts:
     paths:
       - build
+      - "$GO_VERSION_FILE"
     exclude:
       - build/**/CMakeFiles/**/*.o
       - build/**/CMakeFiles/**/*.gcno

common/go/src/asapo_common/version/version.go

@@ -6,15 +6,6 @@ import (
 	"io"
 )
 
-var version string
-
-var consumerProtocolVersion string
-var producerProtocolVersion string
-var discoveryApiVersion string
-var authorizerApiVersion string
-var ftsApiVersion string
-var brokerApiVersion string
-
 func GetDiscoveryApiVersion() string {
 	return discoveryApiVersion
 }

common/go/src/asapo_common/version/version_lib.go.in

@@ -2,12 +2,12 @@ package version
 
 // Default build-time variable for library-import.
 // This file is overridden on build with build-time informations.
-func init(){
-	version   = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
+const (
+	version = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
 	consumerProtocolVersion = "@ASAPO_CONSUMER_PROTOCOL@"
-    producerProtocolVersion = "@ASAPO_PRODUCER_PROTOCOL@"
-    discoveryApiVersion = "@ASAPO_DISCOVERY_API_VER@"
-    authorizerApiVersion = "@ASAPO_AUTHORIZER_API_VER@"
-    ftsApiVersion = "@ASAPO_FILE_TRANSFER_SERVICE_API_VER@"
-    brokerApiVersion = "@ASAPO_BROKER_API_VER@"
-}
+	producerProtocolVersion = "@ASAPO_PRODUCER_PROTOCOL@"
+	discoveryApiVersion = "@ASAPO_DISCOVERY_API_VER@"
+	authorizerApiVersion = "@ASAPO_AUTHORIZER_API_VER@"
+	ftsApiVersion = "@ASAPO_FILE_TRANSFER_SERVICE_API_VER@"
+	brokerApiVersion = "@ASAPO_BROKER_API_VER@"
+)