feat: support new deployer args

Aam-Digital · Jul 11, 2024 · be0b5b7 · be0b5b7
1 parent ba836f2
commit be0b5b7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 5 deletions.
diff --git a/.github/workflows/pr-update.yml b/.github/workflows/pr-update.yml
@@ -20,6 +20,8 @@ jobs:
           context: ./
           file: ./build/Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
+          push: true
+          tags: aamdigital/deployer-ms:pr-${{ github.event.number }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |

diff --git a/integrations/elementor-plugin/form-actions/aam-deploy.php b/integrations/elementor-plugin/form-actions/aam-deploy.php
@@ -41,7 +41,7 @@ public function get_label() {
 	/**
 	 * Run action.
 	 *
-	 * Submit the data to 
+	 * Submit the data to
 	 *
 	 * @since 1.0.0
 	 * @access public
@@ -72,7 +72,9 @@ public function run( $record, $ajax_handler ) {
 					'username' => $fields['username'],
 					'email' => $fields['email'],
 					'monitor' => $settings['monitor'] ? True : False,
+					'sentry' => $settings['sentry'] ? True : False,
 					'backend' => $settings['backend'] ? True : False,
+					'queryBackend' => $settings['queryBackend'] ? True : False,
 					'client' => $settings['client'],
 					'clientKey' => $settings['client-key'],
 					'base' => $settings['base'],
@@ -177,6 +179,15 @@ public function register_settings_section( $widget ) {
 			]
 		);
 
+		$widget->add_control(
+			'queryBackend',
+			[
+				'label' => esc_html__( 'Add am-backend-services (query-backend)', 'elementor-forms-aam-deploy' ),
+				'type' => \Elementor\Controls_Manager::SWITCHER,
+				'description' => esc_html__( 'Deploys aam-backend-services (e.g. reports).', 'elementor-forms-aam-deploy' ),
+			]
+		);
+
 		$widget->add_control(
 			'monitor',
 			[
@@ -186,6 +197,15 @@ public function register_settings_section( $widget ) {
 			]
 		);
 
+		$widget->add_control(
+			'sentry',
+			[
+				'label' => esc_html__( 'Add sentry monitoring', 'elementor-forms-aam-deploy' ),
+				'type' => \Elementor\Controls_Manager::SWITCHER,
+				'description' => esc_html__( 'Adds sentry monitoring for the deployment.', 'elementor-forms-aam-deploy' ),
+			]
+		);
+
 		$widget->add_control(
 			'msg_name_exists',
 			[

diff --git a/src/app.controller.spec.ts b/src/app.controller.spec.ts
@@ -43,7 +43,9 @@ describe('AppController', () => {
     clientKey: 'test-key',
     base: 'test-base',
     backend: true,
+    queryBackend: true,
     monitor: false,
+    sentry: false,
   };
 
   beforeEach(async () => {
@@ -174,7 +176,7 @@ describe('AppController', () => {
 
     expect(res).resolves.toBeTruthy();
     expect(mockWs.write).toHaveBeenCalledWith(
-      'test-name de [email protected] test-username test-base y n',
+      'test-name de [email protected] test-username test-base y y n n',
     );
     expect(mockWs.close).toHaveBeenCalled();
     // Ensure tail is properly "unwatched"
@@ -185,7 +187,7 @@ describe('AppController', () => {
     const emptyLocale = { ...deploymentData, locale: '' };
     controller.deployApp(emptyLocale).subscribe(() => {
       expect(mockWs.write).toHaveBeenCalledWith(
-        'test-name en [email protected] test-username test-base y n',
+        'test-name en [email protected] test-username test-base y y n n',
       );
       done();
     });
@@ -198,7 +200,7 @@ describe('AppController', () => {
     delete noLocale.locale;
     controller.deployApp(noLocale).subscribe(() => {
       expect(mockWs.write).toHaveBeenCalledWith(
-        'test-name en [email protected] test-username test-base y n',
+        'test-name en [email protected] test-username test-base y y n n',
       );
       done();
     });

diff --git a/src/app.controller.ts b/src/app.controller.ts
@@ -73,7 +73,9 @@ export class AppController {
       deploymentInfo.email
     } ${deploymentInfo.username} ${deploymentInfo.base} ${
       deploymentInfo.backend ? 'y' : 'n'
-    } ${deploymentInfo.monitor ? 'y' : 'n'}`;
+    } ${deploymentInfo.queryBackend ? 'y' : 'n'} ${
+      deploymentInfo.monitor ? 'y' : 'n'
+    } ${deploymentInfo.sentry ? 'y' : 'n'}`;
     console.log('args', args);
     const ws = fs.createWriteStream('dist/assets/arg-pipe');
     ws.write(args);

diff --git a/src/deployment-info.dto.ts b/src/deployment-info.dto.ts
@@ -28,11 +28,22 @@ export class DeploymentInfo {
   })
   backend: boolean;
 
+  @ApiProperty({
+    description:
+      'Whether the am-backend-services (query-backend) should be set up.',
+  })
+  queryBackend = true;
+
   @ApiProperty({
     description: 'Whether the new system should be added to uptime monitoring.',
   })
   monitor: boolean;
 
+  @ApiProperty({
+    description: 'Whether the new system should be added to sentry monitoring.',
+  })
+  sentry = true;
+
   @ApiProperty({
     description: 'Name of the Keycloak confidential client.',
   })