add parameter addressing_model for s3_compatible backup (#820)

chris-sun-star · web-flow · commit c5ed89d03a85 · 2025-07-24T15:29:25.000+08:00
diff --git a/internal/resource/obtenantbackuppolicy/utils.go b/internal/resource/obtenantbackuppolicy/utils.go
@@ -135,6 +135,11 @@ func (m *ObTenantBackupPolicyManager) getDestPath(dest apitypes.BackupDestinatio
 		destPath += ("&appid=" + string(secret.Data["appId"]))
 	} else if dest.Type == constants.BackupDestTypeS3 {
 		destPath += ("&s3_region=" + string(secret.Data["s3Region"]))
+	} else if dest.Type == constants.BackupDestTypeS3Compatible {
+		addressingModel, ok := secret.Data["addressingModel"]
+		if ok {
+			destPath += ("&addressing_model=" + string(addressingModel))
+		}
 	}
 	return destPath
 }
diff --git a/make/dashboard.mk b/make/dashboard.mk
@@ -41,7 +41,7 @@ dashboard-clean: ## Clean build
 .PHONY: dashboard-dep-install
 dashboard-dep-install: ## Install dependencies for oceanbase-dashboard
 	@if [ -z "$(shell command -v swag)" ]; then \
-		go install github.com/swaggo/swag/cmd/swag@latest; \
+		go install github.com/swaggo/swag/cmd/swag@v1.16.3; \
 	fi
 	@if [ -z "$(shell command -v go-bindata)" ]; then \
 		go install github.com/go-bindata/go-bindata/...@v3.1.2+incompatible; \

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,11 @@ func (m *ObTenantBackupPolicyManager) getDestPath(dest apitypes.BackupDestinatio`
`135`	`135`	`destPath += ("&appid=" + string(secret.Data["appId"]))`
`136`	`136`	`} else if dest.Type == constants.BackupDestTypeS3 {`
`137`	`137`	`destPath += ("&s3_region=" + string(secret.Data["s3Region"]))`
	`138`	`+ } else if dest.Type == constants.BackupDestTypeS3Compatible {`
	`139`	`+ addressingModel, ok := secret.Data["addressingModel"]`
	`140`	`+ if ok {`
	`141`	`+ destPath += ("&addressing_model=" + string(addressingModel))`
	`142`	`+ }`
`138`	`143`	`}`
`139`	`144`	`return destPath`
`140`	`145`	`}`