Skip to content

Commit d5232ab

Browse files
modular-magicianmodular-magician
authored
Implement pre update and query parameter options. Fix other various sweeper dependency connections (#13469) (#22110)
[upstream:08e4f22f85f71cbefd44c735db6a09891d728ec0] Signed-off-by: Modular Magician <[email protected]>
1 parent a83cefa commit d5232ab

File tree

246 files changed

+2499
-1267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+2499
-1267
lines changed

‎.changelog/13469.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google/services/alloydb/resource_alloydb_backup_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ func deleteResourceAlloydbBackup(config *transport_tpg.Config, d *tpgresource.Re
200200

201201
deleteTemplate := "https://alloydb.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backups/{{backup_id}}"
202202

203-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
203+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
204204
if err != nil {
205205
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
206206
deletionerror = err
207207
}
208-
deleteUrl = deleteUrl + name
208+
url = url + name
209209

210210
// Don't wait on operations as we may have a lot to delete
211211
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
212212
Config: config,
213213
Method: "DELETE",
214214
Project: config.Project,
215-
RawURL: deleteUrl,
215+
RawURL: url,
216216
UserAgent: config.UserAgent,
217217
})
218218
if err != nil {
219-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
219+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
220220
deletionerror = err
221221
} else {
222222
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/apigee/resource_apigee_addons_config_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,23 +197,23 @@ func deleteResourceApigeeAddonsConfig(config *transport_tpg.Config, d *tpgresour
197197

198198
deleteTemplate := "https://apigee.googleapis.com/v1/organizations/{{org}}:setAddons"
199199

200-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
200+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
201201
if err != nil {
202202
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
203203
deletionerror = err
204204
}
205-
deleteUrl = deleteUrl + name
205+
url = url + name
206206

207207
// Don't wait on operations as we may have a lot to delete
208208
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
209209
Config: config,
210210
Method: "DELETE",
211211
Project: config.Project,
212-
RawURL: deleteUrl,
212+
RawURL: url,
213213
UserAgent: config.UserAgent,
214214
})
215215
if err != nil {
216-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
216+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
217217
deletionerror = err
218218
} else {
219219
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/apigee/resource_apigee_organization_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,23 +196,23 @@ func deleteResourceApigeeOrganization(config *transport_tpg.Config, d *tpgresour
196196

197197
deleteTemplate := "https://apigee.googleapis.com/v1/organizations/{{name}}?retention={{retention}}"
198198

199-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
199+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
200200
if err != nil {
201201
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
202202
deletionerror = err
203203
}
204-
deleteUrl = deleteUrl + name
204+
url = url + name
205205

206206
// Don't wait on operations as we may have a lot to delete
207207
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
208208
Config: config,
209209
Method: "DELETE",
210210
Project: config.Project,
211-
RawURL: deleteUrl,
211+
RawURL: url,
212212
UserAgent: config.UserAgent,
213213
})
214214
if err != nil {
215-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
215+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
216216
deletionerror = err
217217
} else {
218218
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/appengine/resource_app_engine_domain_mapping_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,23 +197,23 @@ func deleteResourceAppEngineDomainMapping(config *transport_tpg.Config, d *tpgre
197197

198198
deleteTemplate := "https://appengine.googleapis.com/v1/apps/{{project}}/domainMappings/{{domain_name}}"
199199

200-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
200+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
201201
if err != nil {
202202
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
203203
deletionerror = err
204204
}
205-
deleteUrl = deleteUrl + name
205+
url = url + name
206206

207207
// Don't wait on operations as we may have a lot to delete
208208
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
209209
Config: config,
210210
Method: "DELETE",
211211
Project: config.Project,
212-
RawURL: deleteUrl,
212+
RawURL: url,
213213
UserAgent: config.UserAgent,
214214
})
215215
if err != nil {
216-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
216+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
217217
deletionerror = err
218218
} else {
219219
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/apphub/resource_apphub_application_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,23 +202,23 @@ func deleteResourceApphubApplication(config *transport_tpg.Config, d *tpgresourc
202202

203203
deleteTemplate := "https://apphub.googleapis.com/v1/projects/{{project}}/locations/{{location}}/applications/{{application_id}}"
204204

205-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
205+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
206206
if err != nil {
207207
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
208208
deletionerror = err
209209
}
210-
deleteUrl = deleteUrl + name
210+
url = url + name
211211

212212
// Don't wait on operations as we may have a lot to delete
213213
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
214214
Config: config,
215215
Method: "DELETE",
216216
Project: config.Project,
217-
RawURL: deleteUrl,
217+
RawURL: url,
218218
UserAgent: config.UserAgent,
219219
})
220220
if err != nil {
221-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
221+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
222222
deletionerror = err
223223
} else {
224224
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/apphub/resource_apphub_service_project_attachment_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ func deleteResourceApphubServiceProjectAttachment(config *transport_tpg.Config,
200200

201201
deleteTemplate := "https://apphub.googleapis.com/v1/projects/{{project}}/locations/global/serviceProjectAttachments/{{service_project_attachment_id}}"
202202

203-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
203+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
204204
if err != nil {
205205
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
206206
deletionerror = err
207207
}
208-
deleteUrl = deleteUrl + name
208+
url = url + name
209209

210210
// Don't wait on operations as we may have a lot to delete
211211
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
212212
Config: config,
213213
Method: "DELETE",
214214
Project: config.Project,
215-
RawURL: deleteUrl,
215+
RawURL: url,
216216
UserAgent: config.UserAgent,
217217
})
218218
if err != nil {
219-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
219+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
220220
deletionerror = err
221221
} else {
222222
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/artifactregistry/resource_artifact_registry_repository_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ func deleteResourceArtifactRegistryRepository(config *transport_tpg.Config, d *t
200200

201201
deleteTemplate := "https://artifactregistry.googleapis.com/v1/projects/{{project}}/locations/{{location}}/repositories/{{repository_id}}"
202202

203-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
203+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
204204
if err != nil {
205205
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
206206
deletionerror = err
207207
}
208-
deleteUrl = deleteUrl + name
208+
url = url + name
209209

210210
// Don't wait on operations as we may have a lot to delete
211211
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
212212
Config: config,
213213
Method: "DELETE",
214214
Project: config.Project,
215-
RawURL: deleteUrl,
215+
RawURL: url,
216216
UserAgent: config.UserAgent,
217217
})
218218
if err != nil {
219-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
219+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
220220
deletionerror = err
221221
} else {
222222
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/backupdr/resource_backup_dr_backup_plan_association_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ func deleteResourceBackupDRBackupPlanAssociation(config *transport_tpg.Config, d
200200

201201
deleteTemplate := "https://backupdr.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupPlanAssociations/{{backup_plan_association_id}}"
202202

203-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
203+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
204204
if err != nil {
205205
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
206206
deletionerror = err
207207
}
208-
deleteUrl = deleteUrl + name
208+
url = url + name
209209

210210
// Don't wait on operations as we may have a lot to delete
211211
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
212212
Config: config,
213213
Method: "DELETE",
214214
Project: config.Project,
215-
RawURL: deleteUrl,
215+
RawURL: url,
216216
UserAgent: config.UserAgent,
217217
})
218218
if err != nil {
219-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
219+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
220220
deletionerror = err
221221
} else {
222222
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

‎google/services/backupdr/resource_backup_dr_backup_plan_sweeper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ func deleteResourceBackupDRBackupPlan(config *transport_tpg.Config, d *tpgresour
200200

201201
deleteTemplate := "https://backupdr.googleapis.com/v1/projects/{{project}}/locations/{{location}}/backupPlans/{{backup_plan_id}}"
202202

203-
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
203+
url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
204204
if err != nil {
205205
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
206206
deletionerror = err
207207
}
208-
deleteUrl = deleteUrl + name
208+
url = url + name
209209

210210
// Don't wait on operations as we may have a lot to delete
211211
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
212212
Config: config,
213213
Method: "DELETE",
214214
Project: config.Project,
215-
RawURL: deleteUrl,
215+
RawURL: url,
216216
UserAgent: config.UserAgent,
217217
})
218218
if err != nil {
219-
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
219+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", url, err)
220220
deletionerror = err
221221
} else {
222222
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)

0 commit comments

Comments
 (0)