Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Implements extra API Calls for AdvancedCluster TPF #2852

Merged
merged 10 commits into from
Dec 4, 2024
Merged

chore: Implements extra API Calls for AdvancedCluster TPF #2852

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
22a1cfb
chore: Add support for ExtraAPIInfo in TFModel to find replication_sp…
EspenAlbert Dec 3, 2024
7dd94e0
feat: Initial /tenantUpgrade logic
EspenAlbert Dec 3, 2024
c4ef033
Merge branch 'master' into CLOUDP-286480_extra_api_calls
EspenAlbert Dec 4, 2024
91134ff
refactor: Fix zoneName default for legacy schema
EspenAlbert Dec 4, 2024
f29a751
address PR comments part 1
EspenAlbert Dec 4, 2024
9f14110
use explicit code instead of comments
EspenAlbert Dec 4, 2024
8329f46
chore: remove comments and fix suggested change commit
EspenAlbert Dec 4, 2024
d7f2c89
chore: remove comment
EspenAlbert Dec 4, 2024
e219aae
address PR comments 2
EspenAlbert Dec 4, 2024
f0603cc
test: hard code extra container response
EspenAlbert Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions internal/service/advancedclustertpf/resource_compatibility_reuse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@
// copied from model_advanced_cluster.go
func getAdvancedClusterContainerID(containers []admin.CloudProviderContainer, cluster *admin.CloudRegionConfig20240805) string {
for i := range containers {
if cluster.GetProviderName() == constant.GCP {
return containers[i].GetId()
}
if containers[i].GetProviderName() == cluster.GetProviderName() &&
containers[i].GetRegion() == cluster.GetRegionName() || // For Azure
containers[i].GetRegionName() == cluster.GetRegionName() { // For AWS
gpc := cluster.GetProviderName() == constant.GCP
azure := containers[i].GetProviderName() == cluster.GetProviderName() && containers[i].GetRegion() == cluster.GetRegionName()
aws := containers[i].GetRegionName() == cluster.GetRegionName()

if check gpc || azure || aws {

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / tflint 

expected ';', found gpc

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / tf-validate 

expected ';', found gpc

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / tf-validate 

syntax error: unexpected name gpc, expected {

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / build 

expected ';', found gpc

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / lint 

syntax error: unexpected name gpc, expected { (typecheck)

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / lint 

expected ';', found gpc (typecheck)

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / lint 

syntax error: unexpected name gpc, expected {) (typecheck)

Check failure on line 60 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / lint 

syntax error: unexpected name gpc, expected {) (typecheck)
EspenAlbert marked this conversation as resolved.
Show resolved Hide resolved
return containers[i].GetId()

Check failure on line 61 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / tflint 

expected '{', found 'return'

Check failure on line 61 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / tf-validate 

expected '{', found 'return'

Check failure on line 61 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / build 

expected '{', found 'return'

Check failure on line 61 in internal/service/advancedclustertpf/resource_compatibility_reuse.go

View workflow job for this annotation

GitHub Actions / lint 

expected '{', found 'return' (typecheck)
}
}
return ""
Expand Down
Loading