Use Standard linux folder for storing config

guardian · Apr 17, 2024 · bf5152b · bf5152b
1 parent 9c26e89
commit bf5152b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/packages/cdk/lib/cloudquery/config.ts b/packages/cdk/lib/cloudquery/config.ts
@@ -338,3 +338,5 @@ export const skipTables = [
 	'aws_stepfunctions_map_run_executions',
 	'aws_stepfunctions_executions',
 ];
+
+export const serviceCatalogueConfigDirectory = '/usr/share/cloudquery';
diff --git a/packages/cdk/lib/cloudquery/index.ts b/packages/cdk/lib/cloudquery/index.ts
@@ -22,6 +22,7 @@ import {
 	githubSourceConfig,
 	ns1SourceConfig,
 	riffraffSourcesConfig,
+	serviceCatalogueConfigDirectory,
 	skipTables,
 	snykSourceConfig,
 } from './config';
@@ -341,9 +342,9 @@ export function addCloudqueryEcsCluster(
 	};
 
 	const additionalGithubCommands = [
-		'echo -n $GITHUB_PRIVATE_KEY | base64 -d > /data/github-private-key',
-		'echo -n $GITHUB_APP_ID > /data/github-app-id',
-		'echo -n $GITHUB_INSTALLATION_ID > /data/github-installation-id',
+		`echo -n $GITHUB_PRIVATE_KEY | base64 -d > ${serviceCatalogueConfigDirectory}/github-private-key`,
+		`echo -n $GITHUB_APP_ID >  ${serviceCatalogueConfigDirectory}/github-app-id`,
+		`echo -n $GITHUB_INSTALLATION_ID >  ${serviceCatalogueConfigDirectory}/github-installation-id`,
 	];
 
 	const githubSources: CloudquerySource[] = [

diff --git a/packages/cdk/lib/cloudquery/task.ts b/packages/cdk/lib/cloudquery/task.ts
@@ -20,7 +20,10 @@ import { RetentionDays } from 'aws-cdk-lib/aws-logs';
 import type { DatabaseInstance } from 'aws-cdk-lib/aws-rds';
 import { dump } from 'js-yaml';
 import type { CloudqueryConfig } from './config';
-import { postgresDestinationConfig } from './config';
+import {
+	postgresDestinationConfig,
+	serviceCatalogueConfigDirectory,
+} from './config';
 import { Images } from './images';
 import { singletonPolicy } from './policies';
 import { scheduleFrequency } from './schedule';
@@ -83,7 +86,7 @@ export interface ScheduledCloudqueryTaskProps
 	 * Any additional commands to run within the CloudQuery container.
 	 * These are executed first.
 	 *
-	 * The containers filesystem is mostly read-only. If you need to write files you can use the /data folder.
+	 * The containers filesystem is mostly read-only. If you need to write files you can use the /usr/share/cloudquery folder.
 	 */
 	additionalCommands?: string[];
 
@@ -191,8 +194,6 @@ export class ScheduledCloudqueryTask extends ScheduledFargateTask {
 			},
 		});
 
-		const volumePath = '/data';
-
 		const cloudqueryTask = task.addContainer(`${id}Container`, {
 			image: Images.cloudquery,
 			entryPoint: [''],
@@ -218,9 +219,9 @@ export class ScheduledCloudqueryTask extends ScheduledFargateTask {
 				'-c',
 				[
 					...additionalCommands,
-					`printf '${dump(sourceConfig)}' > ${volumePath}/source.yaml`,
-					`printf '${dump(destinationConfig)}' > ${volumePath}/destination.yaml`,
-					`/app/cloudquery sync ${volumePath}/source.yaml ${volumePath}/destination.yaml --log-format json --log-console --no-log-file`,
+					`printf '${dump(sourceConfig)}' > ${serviceCatalogueConfigDirectory}/source.yaml`,
+					`printf '${dump(destinationConfig)}' > ${serviceCatalogueConfigDirectory}/destination.yaml`,
+					`/app/cloudquery sync ${serviceCatalogueConfigDirectory}/source.yaml ${serviceCatalogueConfigDirectory}/destination.yaml --log-format json --log-console --no-log-file`,
 				].join(';'),
 			],
 			logging: fireLensLogDriver,
@@ -239,7 +240,7 @@ export class ScheduledCloudqueryTask extends ScheduledFargateTask {
 		cloudqueryTask.addMountPoints(
 			{
 				// So that we can write task config to this directory
-				containerPath: volumePath,
+				containerPath: serviceCatalogueConfigDirectory,
 				sourceVolume: 'config-volume',
 				readOnly: false,
 			},