Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
fix: Update dependencies.sh to not break on mac (#541)
Browse files Browse the repository at this point in the history
This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8bbfaa2d-6e9e-4ebd-adb8-7f16af5f378e/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: googleapis/synthtool@8f76a88
  • Loading branch information
yoshi-automation committed Jun 15, 2021
1 parent 2cc66ba commit 87a8fef
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .kokoro/dependencies.sh
Expand Up @@ -46,7 +46,7 @@ function completenessCheck() {
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt

# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
Expand All @@ -70,7 +70,7 @@ function completenessCheck() {
set +e

error_count=0
for path in $(find -name ".flattened-pom.xml")
for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
Expand Down
Expand Up @@ -685,7 +685,7 @@ public final void deleteNotificationConfig(DeleteNotificationConfigRequest reque
*
* <pre>{@code
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* ResourceName resource = ProjectName.of("[PROJECT]");
* ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
* Policy response = securityCenterClient.getIamPolicy(resource);
* }
* }</pre>
Expand All @@ -710,7 +710,8 @@ public final Policy getIamPolicy(ResourceName resource) {
*
* <pre>{@code
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* String resource = ProjectName.of("[PROJECT]").toString();
* String resource =
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString();
* Policy response = securityCenterClient.getIamPolicy(resource);
* }
* }</pre>
Expand All @@ -734,7 +735,8 @@ public final Policy getIamPolicy(String resource) {
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* GetIamPolicyRequest request =
* GetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString())
* .setOptions(GetPolicyOptions.newBuilder().build())
* .build();
* Policy response = securityCenterClient.getIamPolicy(request);
Expand All @@ -758,7 +760,8 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* GetIamPolicyRequest request =
* GetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString())
* .setOptions(GetPolicyOptions.newBuilder().build())
* .build();
* ApiFuture<Policy> future = securityCenterClient.getIamPolicyCallable().futureCall(request);
Expand Down Expand Up @@ -2203,7 +2206,7 @@ public final UnaryCallable<SetFindingStateRequest, Finding> setFindingStateCalla
*
* <pre>{@code
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* ResourceName resource = ProjectName.of("[PROJECT]");
* ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
* Policy policy = Policy.newBuilder().build();
* Policy response = securityCenterClient.setIamPolicy(resource, policy);
* }
Expand Down Expand Up @@ -2233,7 +2236,8 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
*
* <pre>{@code
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* String resource = ProjectName.of("[PROJECT]").toString();
* String resource =
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString();
* Policy policy = Policy.newBuilder().build();
* Policy response = securityCenterClient.setIamPolicy(resource, policy);
* }
Expand Down Expand Up @@ -2262,7 +2266,8 @@ public final Policy setIamPolicy(String resource, Policy policy) {
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* SetIamPolicyRequest request =
* SetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString())
* .setPolicy(Policy.newBuilder().build())
* .build();
* Policy response = securityCenterClient.setIamPolicy(request);
Expand All @@ -2286,7 +2291,8 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* SetIamPolicyRequest request =
* SetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString())
* .setPolicy(Policy.newBuilder().build())
* .build();
* ApiFuture<Policy> future = securityCenterClient.setIamPolicyCallable().futureCall(request);
Expand All @@ -2307,7 +2313,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
*
* <pre>{@code
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* ResourceName resource = ProjectName.of("[PROJECT]");
* ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
* List<String> permissions = new ArrayList<>();
* TestIamPermissionsResponse response =
* securityCenterClient.testIamPermissions(resource, permissions);
Expand Down Expand Up @@ -2339,7 +2345,8 @@ public final TestIamPermissionsResponse testIamPermissions(
*
* <pre>{@code
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* String resource = ProjectName.of("[PROJECT]").toString();
* String resource =
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString();
* List<String> permissions = new ArrayList<>();
* TestIamPermissionsResponse response =
* securityCenterClient.testIamPermissions(resource, permissions);
Expand Down Expand Up @@ -2373,7 +2380,8 @@ public final TestIamPermissionsResponse testIamPermissions(
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* TestIamPermissionsRequest request =
* TestIamPermissionsRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString())
* .addAllPermissions(new ArrayList<String>())
* .build();
* TestIamPermissionsResponse response = securityCenterClient.testIamPermissions(request);
Expand All @@ -2397,7 +2405,8 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
* try (SecurityCenterClient securityCenterClient = SecurityCenterClient.create()) {
* TestIamPermissionsRequest request =
* TestIamPermissionsRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(
* SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]").toString())
* .addAllPermissions(new ArrayList<String>())
* .build();
* ApiFuture<TestIamPermissionsResponse> future =
Expand Down
Expand Up @@ -576,7 +576,7 @@ public void getIamPolicyTest() throws Exception {
.build();
mockSecurityCenter.addResponse(expectedResponse);

ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");

Policy actualResponse = client.getIamPolicy(resource);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -598,7 +598,7 @@ public void getIamPolicyExceptionTest() throws Exception {
mockSecurityCenter.addException(exception);

try {
ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
client.getIamPolicy(resource);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand Down Expand Up @@ -1685,7 +1685,7 @@ public void setIamPolicyTest() throws Exception {
.build();
mockSecurityCenter.addResponse(expectedResponse);

ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
Policy policy = Policy.newBuilder().build();

Policy actualResponse = client.setIamPolicy(resource, policy);
Expand All @@ -1709,7 +1709,7 @@ public void setIamPolicyExceptionTest() throws Exception {
mockSecurityCenter.addException(exception);

try {
ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
Policy policy = Policy.newBuilder().build();
client.setIamPolicy(resource, policy);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -1767,7 +1767,7 @@ public void testIamPermissionsTest() throws Exception {
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).build();
mockSecurityCenter.addResponse(expectedResponse);

ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
List<String> permissions = new ArrayList<>();

TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
Expand All @@ -1791,7 +1791,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
mockSecurityCenter.addException(exception);

try {
ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = SourceName.ofOrganizationSourceName("[ORGANIZATION]", "[SOURCE]");
List<String> permissions = new ArrayList<>();
client.testIamPermissions(resource, permissions);
Assert.fail("No exception raised");
Expand Down
5 changes: 3 additions & 2 deletions synth.metadata
Expand Up @@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-securitycenter.git",
"sha": "54241a4a28e63433abf4fc301da28d924438dd23"
"sha": "2cc66ba13197f0ef95cdad6555c3d46086dab2b5"
}
},
{
Expand Down Expand Up @@ -35,7 +35,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
"sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
}
}
],
Expand Down Expand Up @@ -135,6 +135,7 @@
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
"SECURITY.md",
"codecov.yaml",
"google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1/SecurityCenterClient.java",
"google-cloud-securitycenter/src/main/java/com/google/cloud/securitycenter/v1/SecurityCenterSettings.java",
Expand Down

0 comments on commit 87a8fef

Please sign in to comment.