Merge pull request #311 from atlassian/GUA-708-fix-deployment-pipeline

GUA-708: fix deployment pipeline

Author: bgvozdev

app/src/analytics/analytics-client.ts

@@ -75,7 +75,7 @@ interface Options {
 export const sendAnalytics = async (cloudId: string, eventPayload: EventPayload, accountId?: string, anonymousId?: string): Promise<void> => {
 	console.info('Analytics Request');
 
-	sendEvent(cloudId, eventPayload, accountId, anonymousId)
+	await sendEvent(cloudId, eventPayload, accountId, anonymousId)
 		.then(() => console.info('Analytics event processed'))
 		.catch((e) => console.error({ e }, 'Failed to send analytics event'));
 };

app/src/storage/update-jenkins-server-state.ts

@@ -89,7 +89,7 @@ async function updateJenkinsServerState(
 	}
 }
 
-function sendConnectionAnalytics(cloudId: string, jenkinsServer: JenkinsServer): void {
+async function sendConnectionAnalytics(cloudId: string, jenkinsServer: JenkinsServer): Promise<void> {
 	const hasConfigData = !!jenkinsServer.pluginConfig?.ipAddress;
 	if (hasConfigData) {
 		return;
@@ -100,7 +100,7 @@ function sendConnectionAnalytics(cloudId: string, jenkinsServer: JenkinsServer):
 		actionSubject: AnalyticsTrackEventActionSubjectsEnum.ConfigDataReceived
 	};
 
-	sendAnalytics(cloudId, eventPayload, '', jenkinsServer.pluginConfig?.ipAddress);
+	await sendAnalytics(cloudId, eventPayload, '', jenkinsServer.pluginConfig?.ipAddress);
 }
 
 async function updateJenkinsPluginConfigState(
@@ -111,7 +111,7 @@ async function updateJenkinsPluginConfigState(
 ): Promise<void> {
 	try {
 		const jenkinsServer = await getJenkinsServer(uuid, logger);
-		sendConnectionAnalytics(cloudId, jenkinsServer);
+		await sendConnectionAnalytics(cloudId, jenkinsServer);
 		const {
 			ipAddress, autoBuildEnabled, autoBuildRegex, autoDeploymentsEnabled, autoDeploymentsRegex
 		} = jenkinsEvent;