-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed code as requested in the comments
- Loading branch information
Showing
190 changed files
with
13,047 additions
and
2,175 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
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 |
|---|---|---|
| @@ -1,142 +1,136 @@ | ||
| // find legacy configuration at https://github.com/GoogleCloudPlatform/java-docs-samples/blob/91792d4da53a12f96032f4556815f7d91f27257b/renovate.json | ||
| { | ||
| "extends": [ | ||
| "config:recommended", | ||
| ":approveMajorUpdates", | ||
| "schedule:earlyMondays", | ||
| ":ignoreUnstable", | ||
| extends: [ | ||
| 'config:recommended', | ||
| ':approveMajorUpdates', | ||
| 'schedule:earlyMondays', | ||
| ':ignoreUnstable', | ||
| ], | ||
| "labels": [ | ||
| "dependencies", | ||
| "automerge" | ||
| labels: [ | ||
| 'dependencies', | ||
| 'automerge', | ||
| ], | ||
| "minimumReleaseAge": "7 days", | ||
| "dependencyDashboardLabels": [ | ||
| "type: process", | ||
| minimumReleaseAge: '7 days', | ||
| dependencyDashboardLabels: [ | ||
| 'type: process', | ||
| ], | ||
| // discontinue upgrades for java8 code samples | ||
| "ignorePaths": ["**/*java8*/**", "**/*java-8*/**"], | ||
| "packageRules": [ | ||
| ignorePaths: [ | ||
| '**/*java8*/**', | ||
| '**/*java-8*/**', | ||
| ], | ||
| packageRules: [ | ||
| { | ||
| "matchCategories": [ | ||
| "java" | ||
| matchCategories: [ | ||
| 'java', | ||
| ], | ||
| addLabels: [ | ||
| 'lang: java', | ||
| ], | ||
| "addLabels": [ | ||
| "lang: java" | ||
| ] | ||
| }, | ||
| // TODO: check if auto-merge rules will work at all | ||
| { | ||
| "matchUpdateTypes": [ | ||
| "minor", | ||
| "patch", | ||
| "digest", | ||
| "lockFileMaintenance" | ||
| matchUpdateTypes: [ | ||
| 'minor', | ||
| 'patch', | ||
| 'digest', | ||
| 'lockFileMaintenance', | ||
| ], | ||
| "automerge": true | ||
| automerge: true, | ||
| }, | ||
| { | ||
| "matchDepTypes": [ | ||
| "devDependencies" | ||
| matchDepTypes: [ | ||
| 'devDependencies', | ||
| ], | ||
| "automerge": true | ||
| automerge: true, | ||
| }, | ||
| // group all Dockerfile dependencies | ||
| { | ||
| "matchCategories": [ | ||
| "docker" | ||
| ], | ||
| "matchUpdateTypes": [ | ||
| "minor", | ||
| "patch", | ||
| "digest", | ||
| "lockFileMaintenance" | ||
| ], | ||
| "groupName": "docker", | ||
| "pinDigests": true, | ||
| "automerge": true | ||
| matchCategories: [ | ||
| 'docker', | ||
| ], | ||
| matchUpdateTypes: [ | ||
| 'minor', | ||
| 'patch', | ||
| 'digest', | ||
| 'lockFileMaintenance', | ||
| ], | ||
| groupName: 'docker', | ||
| pinDigests: true, | ||
| automerge: true, | ||
| }, | ||
| // group all terraform dependencies for google providers | ||
| { | ||
| "matchCategories": [ | ||
| "terraform" | ||
| matchCategories: [ | ||
| 'terraform', | ||
| ], | ||
| matchDepTypes: [ | ||
| 'provider', | ||
| 'required_provider', | ||
| ], | ||
| "matchDepTypes": [ | ||
| "provider", | ||
| "required_provider" | ||
| groupName: 'Terraform Google providers', | ||
| matchPackageNames: [ | ||
| '/^google/', | ||
| ], | ||
| "matchPackagePatterns": "^google", | ||
| "groupName": "Terraform Google providers", | ||
| }, | ||
| // *** Java dependency rules: | ||
| // group *ALL* Java dependencies | ||
| { | ||
| "matchCategories": [ | ||
| "java" | ||
| matchCategories: [ | ||
| 'java', | ||
| ], | ||
| "matchUpdateTypes": [ | ||
| "minor", | ||
| "patch", | ||
| "digest", | ||
| "lockFileMaintenance" | ||
| matchUpdateTypes: [ | ||
| 'minor', | ||
| 'patch', | ||
| 'digest', | ||
| 'lockFileMaintenance', | ||
| ], | ||
| "groupName": "java", | ||
| "automerge": true | ||
| groupName: 'java', | ||
| automerge: true, | ||
| }, | ||
| // do not allow Spring Boot 3 upgrades yet | ||
| { | ||
| "matchCategories": [ | ||
| "java" | ||
| matchCategories: [ | ||
| 'java', | ||
| ], | ||
| "matchPackagePatterns": [ | ||
| "org.springframework.boot" | ||
| matchCurrentVersion: '>=2.0.0, <3.0.0', | ||
| allowedVersions: '<3', | ||
| groupName: 'Spring Boot upgrades for v2', | ||
| description: '@akitsch: Spring Boot V3 requires Java 17', | ||
| matchPackageNames: [ | ||
| '/org.springframework.boot/', | ||
| ], | ||
| "matchCurrentVersion": ">=2.0.0, <3.0.0", | ||
| "allowedVersions": "<3", | ||
| "groupName": "Spring Boot upgrades for v2", | ||
| "description": "@akitsch: Spring Boot V3 requires Java 17" | ||
| }, | ||
| // limit micronaut upgrades for versions <= 4 | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "^io.micronaut" | ||
| groupName: 'Micronaut packages', | ||
| allowedVersions: '<4', | ||
| matchFileNames: [ | ||
| 'appengine-java11/**', | ||
| 'flexible/java-11/**', | ||
| ], | ||
| "groupName": "Micronaut packages", | ||
| "allowedVersions": "<4", | ||
| "matchPaths": [ | ||
| "appengine-java11/**", | ||
| "flexible/java-11/**" | ||
| description: '@akitsch: Micronaut V4 requires Java 17', | ||
| matchPackageNames: [ | ||
| '/^io.micronaut/', | ||
| ], | ||
| "description": "@akitsch: Micronaut V4 requires Java 17" | ||
| }, | ||
| // disable Scala dependency upgrades | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "scala" | ||
| enabled: false, | ||
| matchPackageNames: [ | ||
| '/scala/', | ||
| ], | ||
| "enabled": false | ||
| }, | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "^jackson-module-scala" | ||
| enabled: false, | ||
| matchPackageNames: [ | ||
| '/^jackson-module-scala/', | ||
| ], | ||
| "enabled": false | ||
| }, | ||
| // disable SQL Spark dependency upgrades | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "^spark-sql" | ||
| enabled: false, | ||
| matchPackageNames: [ | ||
| '/^spark-sql/', | ||
| ], | ||
| "enabled": false | ||
| }, | ||
| {}, | ||
| ], | ||
| "rebaseWhen": "behind-base-branch", | ||
| "semanticCommits": "enabled", | ||
| "vulnerabilityAlerts": { | ||
| "labels": [ | ||
| "type:security" | ||
| rebaseWhen: 'behind-base-branch', | ||
| semanticCommits: 'enabled', | ||
| vulnerabilityAlerts: { | ||
| labels: [ | ||
| 'type:security', | ||
| ], | ||
| "minimumReleaseAge": null | ||
| minimumReleaseAge: 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
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,59 @@ | ||
| /* | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| // [START apikeys_undelete_api_key] | ||
| import com.google.api.apikeys.v2.ApiKeysClient; | ||
| import com.google.api.apikeys.v2.Key; | ||
| import com.google.api.apikeys.v2.UndeleteKeyRequest; | ||
| import java.io.IOException; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.TimeoutException; | ||
|
|
||
| public class UndeleteApiKey { | ||
|
|
||
| public static void main(String[] args) | ||
| throws IOException, ExecutionException, InterruptedException, TimeoutException { | ||
| // TODO(developer): Replace these variables before running the sample. | ||
| // Project ID or project number of the Google Cloud project. | ||
| String projectId = "YOUR_PROJECT_ID"; | ||
| // The API key id to undelete. | ||
| String keyId = "YOUR_KEY_ID"; | ||
|
|
||
| undeleteApiKey(projectId, keyId); | ||
| } | ||
|
|
||
| // Undeletes an API key. | ||
| public static void undeleteApiKey(String projectId, String keyId) | ||
| throws IOException, ExecutionException, InterruptedException, TimeoutException { | ||
| // Initialize client that will be used to send requests. This client only needs to be created | ||
| // once, and can be reused for multiple requests. | ||
| try (ApiKeysClient apiKeysClient = ApiKeysClient.create()) { | ||
|
|
||
| // Initialize the undelete request and set the argument. | ||
| UndeleteKeyRequest undeleteKeyRequest = UndeleteKeyRequest.newBuilder() | ||
| .setName(String.format("projects/%s/locations/global/keys/%s", projectId, keyId)) | ||
| .build(); | ||
|
|
||
| // Make the request and wait for the operation to complete. | ||
| Key undeletedKey = apiKeysClient.undeleteKeyAsync(undeleteKeyRequest) | ||
| .get(3, TimeUnit.MINUTES); | ||
|
|
||
| System.out.printf("Successfully undeleted the API key: %s", undeletedKey.getName()); | ||
| } | ||
| } | ||
| } | ||
| // [END apikeys_undelete_api_key] |
Oops, something went wrong.