[AutoPR azure-resourcemanager-resourcegraph] Merge Microsoft.security insights 2021 09 01 preview with main

sdk/resourcegraph/azure-resourcemanager-resourcegraph/CHANGELOG.md

@@ -1,7 +1,8 @@
 # Release History
 
-## 1.0.0-beta.3 (Unreleased)
+## 1.0.0-beta.1 (2021-08-24)
 
+- Azure Resource Manager ResourceGraph client library for Java. This package contains Microsoft Azure SDK for ResourceGraph Management SDK. Azure Resource Graph API Reference. Package tag package-preview-2021-06. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## 1.0.0-beta.2 (2021-05-24)
 

sdk/resourcegraph/azure-resourcemanager-resourcegraph/README.md

@@ -2,7 +2,7 @@
 
 Azure Resource Manager ResourceGraph client library for Java.
 
-This package contains Microsoft Azure SDK for ResourceGraph Management SDK. Azure Resource Graph API Reference. Package tag package-preview-2021-03. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for ResourceGraph Management SDK. Azure Resource Graph API Reference. Package tag package-preview-2021-06. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-resourcegraph</artifactId>
-    <version>1.0.0-beta.2</version>
+    <version>1.0.0-beta.3</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml

@@ -13,7 +13,7 @@
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for ResourceGraph Management</name>
-  <description>This package contains Microsoft Azure SDK for ResourceGraph Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Resource Graph API Reference. Package tag package-preview-2021-03.</description>
+  <description>This package contains Microsoft Azure SDK for ResourceGraph Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Resource Graph API Reference. Package tag package-preview-2021-06.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>

sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/ResourceGraphManager.java

@@ -9,14 +9,14 @@
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.policy.AddDatePolicy;
-import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
 import com.azure.core.http.policy.HttpPipelinePolicy;
 import com.azure.core.http.policy.HttpPolicyProviders;
 import com.azure.core.http.policy.RequestIdPolicy;
 import com.azure.core.http.policy.RetryPolicy;
 import com.azure.core.http.policy.UserAgentPolicy;
+import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.logging.ClientLogger;
@@ -80,6 +80,7 @@ public static final class Configurable {
         private HttpClient httpClient;
         private HttpLogOptions httpLogOptions;
         private final List<HttpPipelinePolicy> policies = new ArrayList<>();
+        private final List<String> scopes = new ArrayList<>();
         private RetryPolicy retryPolicy;
         private Duration defaultPollInterval;
 
@@ -119,6 +120,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
             return this;
         }
 
+        /**
+         * Adds the scope to permission sets.
+         *
+         * @param scope the scope.
+         * @return the configurable object itself.
+         */
+        public Configurable withScope(String scope) {
+            this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
+            return this;
+        }
+
         /**
          * Sets the retry policy to the HTTP pipeline.
          *
@@ -161,7 +173,7 @@ public ResourceGraphManager authenticate(TokenCredential credential, AzureProfil
                 .append("-")
                 .append("com.azure.resourcemanager.resourcegraph")
                 .append("/")
-                .append("1.0.0-beta.2");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
@@ -175,6 +187,9 @@ public ResourceGraphManager authenticate(TokenCredential credential, AzureProfil
                 userAgentBuilder.append(" (auto-generated)");
             }
 
+            if (scopes.isEmpty()) {
+                scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
+            }
             if (retryPolicy == null) {
                 retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
             }
@@ -184,10 +199,7 @@ public ResourceGraphManager authenticate(TokenCredential credential, AzureProfil
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
-            policies
-                .add(
-                    new BearerTokenAuthenticationPolicy(
-                        credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
+            policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
             policies.addAll(this.policies);
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));

sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/ResourceGraphClient.java

@@ -16,6 +16,13 @@ public interface ResourceGraphClient {
      */
     String getEndpoint();
 
+    /**
+     * Gets Api Version.
+     *
+     * @return the apiVersion value.
+     */
+    String getApiVersion();
+
     /**
      * Gets The HTTP pipeline to send requests through.
      *

sdk/resourcegraph/azure-resourcemanager-resourcegraph/src/main/java/com/azure/resourcemanager/resourcegraph/fluent/ResourceProvidersClient.java

@@ -9,68 +9,11 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.resourcegraph.fluent.models.QueryResponseInner;
-import com.azure.resourcemanager.resourcegraph.fluent.models.ResourceChangeDataInner;
-import com.azure.resourcemanager.resourcegraph.fluent.models.ResourceChangeListInner;
 import com.azure.resourcemanager.resourcegraph.models.QueryRequest;
-import com.azure.resourcemanager.resourcegraph.models.ResourceChangeDetailsRequestParameters;
-import com.azure.resourcemanager.resourcegraph.models.ResourceChangesRequestParameters;
 import com.azure.resourcemanager.resourcegraph.models.ResourcesHistoryRequest;
-import java.util.List;
 
 /** An instance of this class provides access to all the operations defined in ResourceProvidersClient. */
 public interface ResourceProvidersClient {
-    /**
-     * List changes to a resource for a given time interval.
-     *
-     * @param parameters the parameters for this request for changes.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of changes associated with a resource over a specific time interval.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    ResourceChangeListInner resourceChanges(ResourceChangesRequestParameters parameters);
-
-    /**
-     * List changes to a resource for a given time interval.
-     *
-     * @param parameters the parameters for this request for changes.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of changes associated with a resource over a specific time interval.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ResourceChangeListInner> resourceChangesWithResponse(
-        ResourceChangesRequestParameters parameters, Context context);
-
-    /**
-     * Get resource change details.
-     *
-     * @param parameters The parameters for this request for resource change details.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return resource change details.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    List<ResourceChangeDataInner> resourceChangeDetails(ResourceChangeDetailsRequestParameters parameters);
-
-    /**
-     * Get resource change details.
-     *
-     * @param parameters The parameters for this request for resource change details.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return resource change details.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<List<ResourceChangeDataInner>> resourceChangeDetailsWithResponse(
-        ResourceChangeDetailsRequestParameters parameters, Context context);
-
     /**
      * Queries the resources managed by Azure Resource Manager for scopes specified in the request.
      *
@@ -99,7 +42,7 @@ Response<List<ResourceChangeDataInner>> resourceChangeDetailsWithResponse(
     /**
      * List all snapshots of a resource for a given time interval.
      *
-     * @param request The request parameter.
+     * @param request Request specifying the query and its options.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -111,7 +54,7 @@ Response<List<ResourceChangeDataInner>> resourceChangeDetailsWithResponse(
     /**
      * List all snapshots of a resource for a given time interval.
      *
-     * @param request The request parameter.
+     * @param request Request specifying the query and its options.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.