fix: Database connection issues

simenandre · Feb 16, 2021 · dd28fcb · dd28fcb
1 parent 3719df9
commit dd28fcb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/components/sql.ts b/src/components/sql.ts
@@ -1,6 +1,7 @@
 import * as pulumi from '@pulumi/pulumi';
 import * as gcp from '@pulumi/gcp';
 import { escapeName } from '../libs/utils';
+import { RandomPassword } from '@pulumi/random';
 
 export interface MySQLConfig {
   /**
@@ -55,6 +56,7 @@ export class MySQLComponent extends pulumi.ComponentResource {
   readonly instance: gcp.sql.DatabaseInstance;
   readonly database: gcp.sql.Database;
   readonly user: gcp.sql.User;
+  readonly password: pulumi.Output<string>;
 
   constructor(
     name: string,
@@ -92,11 +94,19 @@ export class MySQLComponent extends pulumi.ComponentResource {
       { parent: this },
     );
 
+    const password = new RandomPassword(name, {
+      length: 20,
+    }, { parent: this });
+
+    this.password = password.result;
+
     this.user = new gcp.sql.User(
       name,
       {
         instance: this.instance.name,
         name: escapeName(`${name}-user`, 5, 16),
+        host: '%',
+        password: this.password,
       },
       { parent: this },
     );

diff --git a/src/libs/env-vars.ts b/src/libs/env-vars.ts
@@ -31,7 +31,7 @@ export function createEnvironmentVariables(config: CreateEnvVarsProps) {
   return [
     {
       name: `${prefix}DB_HOST`,
-      value: pulumi.interpolate`localhost:/cloudsql/${instance.connectionName}`,
+      value: pulumi.interpolate`:/cloudsql/${instance.connectionName}`,
     },
     {
       name: `${prefix}DB_NAME`,

diff --git a/src/wordpress.ts b/src/wordpress.ts
@@ -92,7 +92,7 @@ export class Wordpress extends pulumi.ComponentResource {
         domain,
         dbEnvironmentPrefix: envPrefix[preset],
         databaseSettings: {
-          connectionName: this.database.database.instance,
+          connectionName: this.database.instance.connectionName,
           databaseName: this.database.database.name,
           databaseUsername: this.database.user.name,
           databasePassword: this.database.user.password,