Merge pull request #12 from googleads/update_customer_id

Update customer id. Keep customer id value and don't overwrite with origin.

Author: bobhancockg

update.ps1

@@ -39,6 +39,9 @@ Write-Host "Updating google-ads-api-developer-assistant..."
 $SettingsFile = Join-Path $ProjectDirAbs ".gemini\settings.json"
 $TempSettingsFile = [System.IO.Path]::GetTempFileName()
 
+$CustomerIdFile = Join-Path $ProjectDirAbs "customer_id.txt"
+$TempCustomerIdFile = [System.IO.Path]::GetTempFileName()
+
 try {
     # 1. Backup existing settings if they exist
     if (Test-Path -LiteralPath $SettingsFile) {
@@ -54,6 +57,19 @@ try {
         }
     }
 
+    # 1b. Backup customer_id.txt if it exists
+    if (Test-Path -LiteralPath $CustomerIdFile) {
+        Write-Host "Backing up $CustomerIdFile..."
+        Copy-Item -LiteralPath $CustomerIdFile -Destination $TempCustomerIdFile -Force
+
+        # Reset local changes
+        $GitStatus = git ls-files --error-unmatch $CustomerIdFile 2>$null
+        if ($LASTEXITCODE -eq 0) {
+             Write-Host "Resetting $CustomerIdFile to avoid merge conflicts..."
+             git checkout $CustomerIdFile
+        }
+    }
+
     # 3. Update Repo
     git pull
     if ($LASTEXITCODE -ne 0) {
@@ -106,6 +122,15 @@ try {
         # Save merged
         $RepoContent | ConvertTo-Json -Depth 10 | Set-Content -LiteralPath $SettingsFile -Encoding UTF8
         Write-Host "Settings restored and merged successfully."
+        Write-Host "Settings restored and merged successfully."
+    }
+
+    # 4b. Restore customer_id.txt
+    if ((Test-Path -LiteralPath $TempCustomerIdFile) -and (Get-Item $TempCustomerIdFile).Length -gt 0) {
+        Write-Host "Restoring preserved $CustomerIdFile..."
+        # Always overwrite with user's backup
+        Move-Item -LiteralPath $TempCustomerIdFile -Destination $CustomerIdFile -Force
+        Write-Host "Restored $CustomerIdFile successfully."
     }
 
 }
@@ -118,12 +143,21 @@ catch {
              Copy-Item -LiteralPath $TempSettingsFile -Destination $SettingsFile -Force
          }
     }
+    if ((Test-Path -LiteralPath $TempCustomerIdFile) -and (Get-Item $TempCustomerIdFile).Length -gt 0) {
+         if (-not (Test-Path -LiteralPath $CustomerIdFile) -or (Get-Item $CustomerIdFile).Length -eq 0) {
+             Write-Host "Restoring original customer_id.txt after failure..."
+             Copy-Item -LiteralPath $TempCustomerIdFile -Destination $CustomerIdFile -Force
+         }
+    }
     exit 1
 }
 finally {
     if (Test-Path -LiteralPath $TempSettingsFile) {
         Remove-Item -LiteralPath $TempSettingsFile -Force -ErrorAction SilentlyContinue
     }
+    if (Test-Path -LiteralPath $TempCustomerIdFile) {
+        Remove-Item -LiteralPath $TempCustomerIdFile -Force -ErrorAction SilentlyContinue
+    }
 }
 
 

update.sh

@@ -76,6 +76,9 @@ echo "Updating google-ads-api-developer-assistant..."
 SETTINGS_JSON=".gemini/settings.json"
 TEMP_SETTINGS=$(mktemp)
 
+CUSTOMER_ID_FILE="customer_id.txt"
+TEMP_CUSTOMER_ID=$(mktemp)
+
 # 1. Backup existing settings if they exist
 if [[ -f "${SETTINGS_JSON}" ]]; then
     echo "Backing up ${SETTINGS_JSON}..."
@@ -90,6 +93,18 @@ if [[ -f "${SETTINGS_JSON}" ]]; then
     fi
 fi
 
+# 1b. Backup customer_id.txt if it exists
+if [[ -f "${CUSTOMER_ID_FILE}" ]]; then
+    echo "Backing up ${CUSTOMER_ID_FILE}..."
+    cp "${CUSTOMER_ID_FILE}" "${TEMP_CUSTOMER_ID}"
+
+    # Reset local changes to customer_id.txt to allow git pull
+    if git ls-files --error-unmatch "${CUSTOMER_ID_FILE}" &> /dev/null; then
+        echo "Resetting ${CUSTOMER_ID_FILE} to avoid merge conflicts..."
+        git checkout "${CUSTOMER_ID_FILE}"
+    fi
+fi
+
 if ! git pull; then
     err "ERROR: Failed to update google-ads-api-developer-assistant."
     # Attempt to restore settings if they were backed up? 
@@ -100,6 +115,10 @@ if ! git pull; then
          echo "Restoring original settings after failed pull..."
          mv "${TEMP_SETTINGS}" "${SETTINGS_JSON}"
     fi
+    if [[ -f "${TEMP_CUSTOMER_ID}" ]] && [[ -s "${TEMP_CUSTOMER_ID}" ]]; then
+         echo "Restoring original customer_id.txt after failed pull..."
+         mv "${TEMP_CUSTOMER_ID}" "${CUSTOMER_ID_FILE}"
+    fi
     exit 1
 fi
 
@@ -121,6 +140,15 @@ if [[ -f "${TEMP_SETTINGS}" ]] && [[ -s "${TEMP_SETTINGS}" ]]; then
     rm -f "${TEMP_SETTINGS}"
 fi
 
+# 3b. Restore customer_id.txt
+if [[ -f "${TEMP_CUSTOMER_ID}" ]] && [[ -s "${TEMP_CUSTOMER_ID}" ]]; then
+    echo "Restoring preserved ${CUSTOMER_ID_FILE}..."
+    # Always overwrite with user's backup
+    mv "${TEMP_CUSTOMER_ID}" "${CUSTOMER_ID_FILE}"
+    echo "${CUSTOMER_ID_FILE} restored successfully."
+    rm -f "${TEMP_CUSTOMER_ID}"
+fi
+
 echo "Successfully updated google-ads-api-developer-assistant."
 
 # --- Locate and Update Client Libraries ---