chore: wip

Author: chrisbbreuer

.stacks/core/buddy/src/commands/cloud.ts

@@ -154,6 +154,17 @@ export function cloud(buddy: CLI) {
         stdin: 'inherit',
       })
 
+      // for some still unknown reason to me (Chris), sometimes, running this
+      // command once is not enough to remove all resources, so we loop
+      // over it a few times to ensure everything is removed
+      for (let i = 0; i < 3; i++) {
+        await runCommand('buddy cloud:clean-up', {
+          ...options,
+          cwd: p.projectPath(),
+          stdin: 'inherit',
+        })
+      }
+
       await outro('Your cloud has now been removed', { startTime, useSeconds: true })
       process.exit(ExitCode.Success)
     })

.stacks/core/cloud/src/helpers.ts

@@ -249,8 +249,7 @@ export async function deleteStacksBuckets() {
     return ok('Stacks buckets deleted')
   }
   catch (error) {
-    // handleError('Error deleting stacks buckets', error)
-    return err('Error deleting stacks buckets', error)
+    return err(handleError('Error deleting stacks buckets', error as Error))
   }
 }
 
@@ -287,7 +286,7 @@ export async function deleteLogGroups() {
     return ok('Log groups deleted')
   }
   catch (error) {
-    return err(handleError(error))
+    return err(handleError('Error deleting log groups', error as Error))
   }
 }
 
@@ -299,7 +298,7 @@ export async function deleteCdkRemnants() {
     ]))
   }
   catch (error) {
-    return err(handleError(error))
+    return err(handleError('Error deleting CDK remnants', error as Error))
   }
 }
 
@@ -308,11 +307,10 @@ export async function hasBeenDeployed() {
 
   try {
     const response = await s3.send(new ListBucketsCommand({}))
-    return response.Buckets?.some(bucket => bucket.Name?.includes(config.app.name?.toLocaleLowerCase() || 'stacks')) || false
+    return ok(response.Buckets?.some(bucket => bucket.Name?.includes(config.app.name?.toLocaleLowerCase() || 'stacks')) || false)
   }
   catch (error) {
-    console.error('Error fetching buckets', error)
-    return false
+    return err(handleError('Error checking if the app has been deployed', error as Error))
   }
 }
 

.stacks/core/dns/src/drivers/aws.ts

@@ -153,8 +153,6 @@ export async function getNameservers(domainName?: string) {
   if (!domainName)
     return []
 
-  log.info('domainName', domainName)
-
   try {
     const route53Domains = new Route53Domains()
     const domainDetail = await route53Domains.getDomainDetail({ DomainName: domainName })
@@ -174,7 +172,7 @@ export async function updateNameservers(hostedZoneNameservers: string[], domainN
 
   const domainNameservers = await getNameservers(domainName)
 
-  if (JSON.stringify(domainNameservers?.sort()) !== JSON.stringify(hostedZoneNameservers.sort())) {
+  if (domainNameservers && hostedZoneNameservers && JSON.stringify(domainNameservers.sort()) !== JSON.stringify(hostedZoneNameservers.sort())) {
     log.info('Updating your domain nameservers to match the ones in your hosted zone...')
     log.debug('Hosted zone nameservers:', hostedZoneNameservers)
     log.debug('Domain nameservers:', domainNameservers)
@@ -197,31 +195,24 @@ export async function updateNameservers(hostedZoneNameservers: string[], domainN
 
 // please note, this function also updates the user's nameservers if they are out of date
 export async function hasUserDomainBeenAddedToCloud(domainName?: string) {
-  log.info('hasUserDomainBeenAddedToCloud for', domainName)
   if (!domainName)
     domainName = config.app.url
 
   const route53 = new Route53()
 
   // Check if the hosted zone already exists
   const existingHostedZones = await route53.listHostedZonesByName({ DNSName: domainName })
-  log.info('existingHostedZones', existingHostedZones)
   if (!existingHostedZones || !existingHostedZones.HostedZones)
     return false
 
   const existingHostedZone = existingHostedZones.HostedZones.find(zone => zone.Name === `${domainName}.`)
   if (existingHostedZone) {
     log.info('existingHostedZone', existingHostedZone)
 
-    // need to ensure the user has updated their nameservers if they aren't up to date already
-    const domainNameservers = await getNameservers(domainName)
-    log.info('domainNameservers', domainNameservers)
     const hostedZoneDetail = await route53.getHostedZone({ Id: existingHostedZone.Id })
     const hostedZoneNameservers = hostedZoneDetail.DelegationSet?.NameServers || []
-    log.info('hostedZoneNameservers', hostedZoneNameservers)
 
-    await updateNameservers(domainNameservers, hostedZoneNameservers, domainName)
-    log.info('here')
+    await updateNameservers(hostedZoneNameservers, domainName)
 
     return true
   }