Skip to content

Commit

Permalink
Merge branch 'main' into onetime-credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
padamstx authored Jul 11, 2024
2 parents 1b6991a + b65653d commit 5ec1120
Show file tree
Hide file tree
Showing 101 changed files with 174 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.54.1
current_version = 0.54.2
commit = True
message = Update version {current_version} -> {new_version}

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [0.54.2](https://github.com/IBM/platform-services-java-sdk/compare/0.54.1...0.54.2) (2024-07-05)


### Bug Fixes

* **IAM Policy Management:** remove `options` property from PolicyAssignment ([#248](https://github.com/IBM/platform-services-java-sdk/issues/248)) ([9897bb5](https://github.com/IBM/platform-services-java-sdk/commit/9897bb545a86a91e02bf2d23ca4bc40c4d9a6d29))

## [0.54.1](https://github.com/IBM/platform-services-java-sdk/compare/0.54.0...0.54.1) (2024-06-21)


Expand Down
54 changes: 27 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@



# IBM Cloud Platform Services Java SDK Version 0.54.1
# IBM Cloud Platform Services Java SDK Version 0.54.2

Java client library to interact with various
[IBM Cloud Platform Service APIs](https://cloud.ibm.com/docs?tab=api-docs&category=platform_services).
Expand Down Expand Up @@ -46,35 +46,35 @@ The IBM Cloud Platform Services Java SDK allows developers to programmatically i

Service Name | Artifact Coordinates
--- | ---
[Case Management](https://cloud.ibm.com/apidocs/case-management?code=java) | com.ibm.cloud:case-management:0.54.1
[Catalog Management](https://cloud.ibm.com/apidocs/resource-catalog/private-catalog?code=java) | com.ibm.cloud:catalog-management:0.54.1
[Context Based Restrictions](https://cloud.ibm.com/apidocs/context-based-restrictions?code=java) | com.ibm.cloud:context-based-restrictions:0.54.1
[Enterprise Billing Units](https://cloud.ibm.com/apidocs/enterprise-apis/billing-unit?code=java) | com.ibm.cloud:enterprise-billing-units:0.54.1
[Enterprise Management](https://cloud.ibm.com/apidocs/enterprise-apis/enterprise?code=java) | com.ibm.cloud:enterprise-management:0.54.1
[Enterprise Usage Reports](https://cloud.ibm.com/apidocs/enterprise-apis/resource-usage-reports?code=java) | com.ibm.cloud:enterprise-usage-reports:0.54.1
[Global Catalog](https://cloud.ibm.com/apidocs/resource-catalog/global-catalog?code=java) | com.ibm.cloud:global-catalog:0.54.1
[Global Search](https://cloud.ibm.com/apidocs/search?code=java) | com.ibm.cloud:global-search:0.54.1
[Global Tagging](https://cloud.ibm.com/apidocs/tagging?code=java) | com.ibm.cloud:global-tagging:0.54.1
[IAM Access Groups](https://cloud.ibm.com/apidocs/iam-access-groups?code=java) | com.ibm.cloud:iam-access-groups:0.54.1
[IAM Identity Service](https://cloud.ibm.com/apidocs/iam-identity-token-api?code=java) | com.ibm.cloud:iam-identity:0.54.1
[IAM Policy Management](https://cloud.ibm.com/apidocs/iam-policy-management?code=java) | com.ibm.cloud:iam-policy-management:0.54.1
[IBM Cloud Shell](https://cloud.ibm.com/apidocs/cloudshell?code=java) | com.ibm.cloud:ibm-cloud-shell:0.54.1
[Open Service Broker](https://cloud.ibm.com/apidocs/resource-controller/ibm-cloud-osb-api?code=java) | com.ibm.cloud:open-service-broker:0.54.1
[Partner Billing Units](https://cloud.ibm.com/apidocs/partner-apis/billing-unit?code=java) | com.ibm.cloud:partner-billing-units:0.54.1
[Partner Usage Reports](https://cloud.ibm.com/apidocs/partner-apis/resource-usage-reports?code=java) | com.ibm.cloud:partner-usage-reports:0.54.1
[Resource Controller](https://cloud.ibm.com/apidocs/resource-controller/resource-controller?code=java) | com.ibm.cloud:resource-controller:0.54.1
[Resource Manager](https://cloud.ibm.com/apidocs/resource-controller/resource-manager?code=java) | com.ibm.cloud:resource-manager:0.54.1
[Usage Metering](https://cloud.ibm.com/apidocs/usage-metering?code=java) | com.ibm.cloud:usage-metering:0.54.1
[Usage Reports](https://cloud.ibm.com/apidocs/metering-reporting?code=java) | com.ibm.cloud:usage-reports:0.54.1
[User Management](https://cloud.ibm.com/apidocs/user-management?code=java) | com.ibm.cloud:user-management:0.54.1
[Case Management](https://cloud.ibm.com/apidocs/case-management?code=java) | com.ibm.cloud:case-management:0.54.2
[Catalog Management](https://cloud.ibm.com/apidocs/resource-catalog/private-catalog?code=java) | com.ibm.cloud:catalog-management:0.54.2
[Context Based Restrictions](https://cloud.ibm.com/apidocs/context-based-restrictions?code=java) | com.ibm.cloud:context-based-restrictions:0.54.2
[Enterprise Billing Units](https://cloud.ibm.com/apidocs/enterprise-apis/billing-unit?code=java) | com.ibm.cloud:enterprise-billing-units:0.54.2
[Enterprise Management](https://cloud.ibm.com/apidocs/enterprise-apis/enterprise?code=java) | com.ibm.cloud:enterprise-management:0.54.2
[Enterprise Usage Reports](https://cloud.ibm.com/apidocs/enterprise-apis/resource-usage-reports?code=java) | com.ibm.cloud:enterprise-usage-reports:0.54.2
[Global Catalog](https://cloud.ibm.com/apidocs/resource-catalog/global-catalog?code=java) | com.ibm.cloud:global-catalog:0.54.2
[Global Search](https://cloud.ibm.com/apidocs/search?code=java) | com.ibm.cloud:global-search:0.54.2
[Global Tagging](https://cloud.ibm.com/apidocs/tagging?code=java) | com.ibm.cloud:global-tagging:0.54.2
[IAM Access Groups](https://cloud.ibm.com/apidocs/iam-access-groups?code=java) | com.ibm.cloud:iam-access-groups:0.54.2
[IAM Identity Service](https://cloud.ibm.com/apidocs/iam-identity-token-api?code=java) | com.ibm.cloud:iam-identity:0.54.2
[IAM Policy Management](https://cloud.ibm.com/apidocs/iam-policy-management?code=java) | com.ibm.cloud:iam-policy-management:0.54.2
[IBM Cloud Shell](https://cloud.ibm.com/apidocs/cloudshell?code=java) | com.ibm.cloud:ibm-cloud-shell:0.54.2
[Open Service Broker](https://cloud.ibm.com/apidocs/resource-controller/ibm-cloud-osb-api?code=java) | com.ibm.cloud:open-service-broker:0.54.2
[Partner Billing Units](https://cloud.ibm.com/apidocs/partner-apis/billing-unit?code=java) | com.ibm.cloud:partner-billing-units:0.54.2
[Partner Usage Reports](https://cloud.ibm.com/apidocs/partner-apis/resource-usage-reports?code=java) | com.ibm.cloud:partner-usage-reports:0.54.2
[Resource Controller](https://cloud.ibm.com/apidocs/resource-controller/resource-controller?code=java) | com.ibm.cloud:resource-controller:0.54.2
[Resource Manager](https://cloud.ibm.com/apidocs/resource-controller/resource-manager?code=java) | com.ibm.cloud:resource-manager:0.54.2
[Usage Metering](https://cloud.ibm.com/apidocs/usage-metering?code=java) | com.ibm.cloud:usage-metering:0.54.2
[Usage Reports](https://cloud.ibm.com/apidocs/metering-reporting?code=java) | com.ibm.cloud:usage-reports:0.54.2
[User Management](https://cloud.ibm.com/apidocs/user-management?code=java) | com.ibm.cloud:user-management:0.54.2

The following services have been relocated to a different SDK project.
Please consult the documentation for each service to determine the new location:

Service Name | Artifact Coordinates
--- | ---
[Configuration Governance](https://cloud.ibm.com/apidocs/security-compliance/config?code=java) | com.ibm.cloud:configuration-governance:0.54.1
[Posture Management](https://cloud.ibm.com/apidocs/security-compliance/posture?code=java) | com.ibm.cloud:posture_management:0.54.1
[Configuration Governance](https://cloud.ibm.com/apidocs/security-compliance/config?code=java) | com.ibm.cloud:configuration-governance:0.54.2
[Posture Management](https://cloud.ibm.com/apidocs/security-compliance/posture?code=java) | com.ibm.cloud:posture_management:0.54.2

## Prerequisites

Expand All @@ -85,7 +85,7 @@ Service Name | Artifact Coordinates
* Java 8 or above.

## Installation
The current version of this SDK is: 0.54.1
The current version of this SDK is: 0.54.2

Each service's artifact coordinates are listed in the table above.

Expand All @@ -104,13 +104,13 @@ Here are examples for maven and gradle:
<dependency>
<groupId>com.ibm.cloud</groupId>
<artifactId>case-management</artifactId>
<version>0.54.1</version>
<version>0.54.2</version>
</dependency>
```

### Gradle
```gradle
compile 'com.ibm.cloud:case-management:0.54.1'
compile 'com.ibm.cloud:case-management:0.54.2'
```

## Using the SDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.ListPolicyAssignmentsOptions;
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.AssignmentTargetDetails;
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.AssignmentTemplateDetails;
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.PolicyAssignmentV1OptionsRoot;
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.PolicyAssignmentV1Options;
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.CreatePolicyTemplateAssignmentOptions;
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.UpdatePolicyAssignmentOptions;
import com.ibm.cloud.platform_services.iam_policy_management.v1.model.DeletePolicyAssignmentOptions;
Expand Down Expand Up @@ -986,19 +984,11 @@ public static void main(String[] args) throws Exception {
.id(exampleTemplateId)
.version(exampleBaseTemplateVersion)
.build();
PolicyAssignmentV1OptionsRoot rootAssignmentDetails = new PolicyAssignmentV1OptionsRoot.Builder()
.requesterId("test_sdk")
.assignmentId("test")
.build();
PolicyAssignmentV1Options assignmentV1Options = new PolicyAssignmentV1Options.Builder()
.root(rootAssignmentDetails)
.build();

CreatePolicyTemplateAssignmentOptions createPolicyAssignmentOptions = new CreatePolicyTemplateAssignmentOptions.Builder()
.version("1.0")
.target(assignmentTargetDetails)
.templates(new ArrayList<AssignmentTemplateDetails>(Arrays.asList(assignmentTemplateDetails)))
.options(assignmentV1Options)
.build();

Response<PolicyAssignmentV1Collection> response = service.createPolicyTemplateAssignment(createPolicyAssignmentOptions).execute();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/

/*
* IBM OpenAPI SDK Code Generator Version: 3.88.0-b0b4c159-20240402-205910
* IBM OpenAPI SDK Code Generator Version: 3.90.1-64fd3296-20240515-180710
*/

package com.ibm.cloud.platform_services.iam_policy_management.v1;
Expand Down Expand Up @@ -1388,7 +1388,6 @@ public ServiceCall<PolicyAssignmentV1Collection> createPolicyTemplateAssignment(
builder.query("version", String.valueOf(createPolicyTemplateAssignmentOptions.version()));
final JsonObject contentJson = new JsonObject();
contentJson.add("target", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(createPolicyTemplateAssignmentOptions.target()));
contentJson.add("options", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(createPolicyTemplateAssignmentOptions.options()));
contentJson.add("templates", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(createPolicyTemplateAssignmentOptions.templates()));
builder.bodyJson(contentJson);
ResponseConverter<PolicyAssignmentV1Collection> responseConverter =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import java.util.ArrayList;
Expand All @@ -24,7 +25,6 @@ public class CreatePolicyTemplateAssignmentOptions extends GenericModel {

protected String version;
protected AssignmentTargetDetails target;
protected PolicyAssignmentV1Options options;
protected List<AssignmentTemplateDetails> templates;
protected String acceptLanguage;

Expand All @@ -34,7 +34,6 @@ public class CreatePolicyTemplateAssignmentOptions extends GenericModel {
public static class Builder {
private String version;
private AssignmentTargetDetails target;
private PolicyAssignmentV1Options options;
private List<AssignmentTemplateDetails> templates;
private String acceptLanguage;

Expand All @@ -46,7 +45,6 @@ public static class Builder {
private Builder(CreatePolicyTemplateAssignmentOptions createPolicyTemplateAssignmentOptions) {
this.version = createPolicyTemplateAssignmentOptions.version;
this.target = createPolicyTemplateAssignmentOptions.target;
this.options = createPolicyTemplateAssignmentOptions.options;
this.templates = createPolicyTemplateAssignmentOptions.templates;
this.acceptLanguage = createPolicyTemplateAssignmentOptions.acceptLanguage;
}
Expand All @@ -62,13 +60,11 @@ public Builder() {
*
* @param version the version
* @param target the target
* @param options the options
* @param templates the templates
*/
public Builder(String version, AssignmentTargetDetails target, PolicyAssignmentV1Options options, List<AssignmentTemplateDetails> templates) {
public Builder(String version, AssignmentTargetDetails target, List<AssignmentTemplateDetails> templates) {
this.version = version;
this.target = target;
this.options = options;
this.templates = templates;
}

Expand Down Expand Up @@ -119,17 +115,6 @@ public Builder target(AssignmentTargetDetails target) {
return this;
}

/**
* Set the options.
*
* @param options the options
* @return the CreatePolicyTemplateAssignmentOptions builder
*/
public Builder options(PolicyAssignmentV1Options options) {
this.options = options;
return this;
}

/**
* Set the templates.
* Existing templates will be replaced.
Expand Down Expand Up @@ -161,13 +146,10 @@ protected CreatePolicyTemplateAssignmentOptions(Builder builder) {
"version cannot be null");
com.ibm.cloud.sdk.core.util.Validator.notNull(builder.target,
"target cannot be null");
com.ibm.cloud.sdk.core.util.Validator.notNull(builder.options,
"options cannot be null");
com.ibm.cloud.sdk.core.util.Validator.notNull(builder.templates,
"templates cannot be null");
version = builder.version;
target = builder.target;
options = builder.options;
templates = builder.templates;
acceptLanguage = builder.acceptLanguage;
}
Expand Down Expand Up @@ -203,17 +185,6 @@ public AssignmentTargetDetails target() {
return target;
}

/**
* Gets the options.
*
* The set of properties required for a policy assignment.
*
* @return the options
*/
public PolicyAssignmentV1Options options() {
return options;
}

/**
* Gets the templates.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* (C) Copyright IBM Corp. 2023.
* (C) Copyright IBM Corp. 2024.
*
* 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
Expand All @@ -10,6 +10,7 @@
* 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.ibm.cloud.platform_services.iam_policy_management.v1.model;

import com.ibm.cloud.sdk.core.service.model.GenericModel;
Expand Down
Loading

0 comments on commit 5ec1120

Please sign in to comment.