-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(gcp): provide a configurable option to bypass gcp account health…
… check. (backport #6093) (#6098) * feat(gcp): provide a configurable option to bypass gcp account health check. * feat(gcp): replace with in-line check solution. --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit df2bb06) Co-authored-by: armory-abedonik <106548537+armory-abedonik@users.noreply.github.com> Co-authored-by: Cameron Motevasselani <cmotevasselani@gmail.com>
- Loading branch information
3 people
committed
Nov 22, 2023
1 parent
75e00c7
commit ef4bbdc
Showing
4 changed files
with
184 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...t/groovy/com/netflix/spinnaker/clouddriver/google/health/GoogleHealthIndicatorSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Copyright 2023 Armory, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.clouddriver.google.health | ||
|
|
||
|
|
||
| import com.google.api.services.compute.model.Project | ||
| import com.google.common.collect.ImmutableList | ||
| import com.google.common.collect.ImmutableMap | ||
| import com.netflix.spectator.api.NoopRegistry | ||
| import com.netflix.spectator.api.Registry | ||
| import com.netflix.spinnaker.clouddriver.google.provider.agent.StubComputeFactory | ||
| import com.netflix.spinnaker.clouddriver.google.security.GoogleNamedAccountCredentials | ||
| import com.netflix.spinnaker.credentials.CredentialsRepository | ||
| import com.netflix.spinnaker.credentials.CredentialsTypeBaseConfiguration | ||
| import org.springframework.boot.actuate.health.Status | ||
| import org.springframework.context.ApplicationContext | ||
| import spock.lang.Specification | ||
| import spock.lang.Unroll | ||
|
|
||
| class GoogleHealthIndicatorSpec extends Specification { | ||
|
|
||
| private static final String ACCOUNT_NAME = "partypups" | ||
| private static final String PROJECT = "myproject" | ||
| private static final String REGION = "myregion" | ||
| private static final String ZONE = REGION + "-myzone" | ||
| private static final Registry REGISTRY = new NoopRegistry() | ||
|
|
||
| @Unroll | ||
| def "health succeeds when google is reachable"() { | ||
| setup: | ||
| def applicationContext = Mock(ApplicationContext) | ||
| def project = new Project() | ||
| project.setName(PROJECT) | ||
|
|
||
| def compute = new StubComputeFactory() | ||
| .setProjects(project) | ||
| .create() | ||
|
|
||
| def googleNamedAccountCredentials = | ||
| new GoogleNamedAccountCredentials.Builder() | ||
| .project(PROJECT) | ||
| .name(ACCOUNT_NAME) | ||
| .compute(compute) | ||
| .regionToZonesMap(ImmutableMap.of(REGION, ImmutableList.of(ZONE))) | ||
| .build() | ||
|
|
||
| def credentials = [googleNamedAccountCredentials] | ||
| def credentialsRepository = Stub(CredentialsRepository) { | ||
| getAll() >> credentials | ||
| } | ||
|
|
||
| def credentialsTypeBaseConfiguration = new CredentialsTypeBaseConfiguration(applicationContext, null) | ||
| credentialsTypeBaseConfiguration.credentialsRepository = credentialsRepository | ||
|
|
||
| def indicator = new GoogleHealthIndicator() | ||
| indicator.registry = REGISTRY | ||
| indicator.credentialsTypeBaseConfiguration = credentialsTypeBaseConfiguration | ||
|
|
||
| when: | ||
| indicator.checkHealth() | ||
| def health = indicator.health() | ||
|
|
||
| then: | ||
| health.status == Status.UP | ||
| health.details.isEmpty() | ||
| } | ||
|
|
||
| @Unroll | ||
| def "health throws exception when google appears unreachable"() { | ||
| setup: | ||
| def applicationContext = Mock(ApplicationContext) | ||
| def project = new Project() | ||
| project.setName(PROJECT) | ||
|
|
||
| def compute = new StubComputeFactory() | ||
| .setProjects(project) | ||
| .setProjectException(new IOException("Read timed out")) | ||
| .create() | ||
|
|
||
| def googleNamedAccountCredentials = | ||
| new GoogleNamedAccountCredentials.Builder() | ||
| .project(PROJECT) | ||
| .name(ACCOUNT_NAME) | ||
| .compute(compute) | ||
| .regionToZonesMap(ImmutableMap.of(REGION, ImmutableList.of(ZONE))) | ||
| .build() | ||
|
|
||
| def credentials = [googleNamedAccountCredentials] | ||
| def credentialsRepository = Stub(CredentialsRepository) { | ||
| getAll() >> credentials | ||
| } | ||
|
|
||
| def credentialsTypeBaseConfiguration = new CredentialsTypeBaseConfiguration(applicationContext, null) | ||
| credentialsTypeBaseConfiguration.credentialsRepository = credentialsRepository | ||
|
|
||
| def indicator = new GoogleHealthIndicator() | ||
| indicator.registry = REGISTRY | ||
| indicator.credentialsTypeBaseConfiguration = credentialsTypeBaseConfiguration | ||
|
|
||
| when: | ||
| indicator.checkHealth() | ||
| def health = indicator.health() | ||
|
|
||
| then: | ||
| thrown(GoogleHealthIndicator.GoogleIOException) | ||
|
|
||
| health == null | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters