Merge remote-tracking branch 'upstream/main' into wangamber/transcription

Author: amber-yujueWang

eng/common/scripts/Verify-ChangeLogs.ps1

@@ -11,8 +11,10 @@ Set-StrictMode -Version 3
 
 function ShouldVerifyChangeLog ($PkgArtifactDetails) {
   if ($PkgArtifactDetails) {
-    if ($PkgArtifactDetails.PSObject.Properties["skipVerifyChangeLog"] -eq $true) {
-      return $false
+    if ($PkgArtifactDetails.PSObject.Properties.Name -contains "skipVerifyChangeLog") {
+      if ($PkgArtifactDetails.skipVerifyChangeLog) {
+        return $false
+      }
     }
 
     return $true

eng/emitter-package-lock.json

@@ -1,7 +1,7 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-java": "0.37.1"
+    "@azure-tools/typespec-java": "0.37.2"
   },
   "devDependencies": {
     "@azure-tools/typespec-autorest": "0.62.0",

eng/emitter-package.json

@@ -0,0 +1,31 @@
+# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
+
+trigger:
+  branches:
+    include:
+      - main
+      - feature/*
+      - release/*
+      - hotfix/*
+  paths:
+    include:
+      - eng/scripts/*
+    exclude:
+      - eng/scripts/typespec
+
+pr:
+  branches:
+    include:
+      - main
+      - feature/*
+      - release/*
+      - hotfix/*
+  paths:
+    include:
+      - eng/scripts/*
+
+extends:
+  template: /eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
+  parameters:
+    TargetDirectory: eng/scripts/
+    TargetTags: 'UnitTest'

eng/scripts/ci.yml

@@ -1,6 +1,6 @@
 # Release History
 
-## 2.1.0-beta.1 (2025-11-28)
+## 2.1.0-beta.1 (2025-12-04)
 
 - Azure Resource Manager NetAppFiles client library for Java. This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package api-version 2025-09-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
@@ -238,6 +238,8 @@
 
 * `models.ElasticBackupVaultProperties` was added
 
+* `models.CachePropertiesExportPolicy` was added
+
 * `models.ElasticBackupPolicy$DefinitionStages` was added
 
 * `models.ElasticNfsv4Access` was added
@@ -376,46 +378,46 @@
 
 #### `models.Volume$Definition` was modified
 
-* `withLdapServerType(models.LdapServerType)` was added
 * `withBreakthroughMode(models.BreakthroughMode)` was added
 * `withLargeVolumeType(models.LargeVolumeType)` was added
 * `withLanguage(models.VolumeLanguage)` was added
+* `withLdapServerType(models.LdapServerType)` was added
 
 #### `models.ReplicationObject` was modified
 
-* `mirrorState()` was added
+* `relationshipStatus()` was added
 * `externalReplicationSetupInfo()` was added
 * `externalReplicationSetupStatus()` was added
-* `relationshipStatus()` was added
+* `mirrorState()` was added
 
 #### `models.NetAppAccountPatch` was modified
 
-* `ldapConfiguration()` was added
 * `withLdapConfiguration(models.LdapConfiguration)` was added
+* `ldapConfiguration()` was added
 
 #### `models.NetAppAccount$Update` was modified
 
 * `withLdapConfiguration(models.LdapConfiguration)` was added
 
 #### `models.VolumeGroupVolumeProperties` was modified
 
-* `language()` was added
 * `withLargeVolumeType(models.LargeVolumeType)` was added
-* `withBreakthroughMode(models.BreakthroughMode)` was added
+* `ldapServerType()` was added
+* `largeVolumeType()` was added
 * `withLanguage(models.VolumeLanguage)` was added
 * `breakthroughMode()` was added
-* `ldapServerType()` was added
+* `language()` was added
+* `withBreakthroughMode(models.BreakthroughMode)` was added
 * `withLdapServerType(models.LdapServerType)` was added
-* `largeVolumeType()` was added
 
 #### `models.Volume` was modified
 
-* `largeVolumeType()` was added
+* `listQuotaReport(com.azure.core.util.Context)` was added
 * `language()` was added
+* `largeVolumeType()` was added
+* `breakthroughMode()` was added
 * `listQuotaReport()` was added
 * `ldapServerType()` was added
-* `breakthroughMode()` was added
-* `listQuotaReport(com.azure.core.util.Context)` was added
 
 #### `models.VolumePropertiesDataProtection` was modified
 
@@ -424,23 +426,23 @@
 
 #### `NetAppFilesManager` was modified
 
-* `elasticAccounts()` was added
-* `ransomwareReports()` was added
 * `buckets()` was added
-* `elasticSnapshotPolicies()` was added
 * `activeDirectoryConfigs()` was added
+* `elasticCapacityPools()` was added
+* `elasticAccounts()` was added
 * `caches()` was added
-* `elasticBackupVaults()` was added
 * `elasticBackupPolicies()` was added
-* `elasticCapacityPools()` was added
+* `ransomwareReports()` was added
+* `elasticSnapshotPolicies()` was added
 * `elasticVolumes()` was added
-* `elasticSnapshots()` was added
 * `elasticBackups()` was added
+* `elasticBackupVaults()` was added
+* `elasticSnapshots()` was added
 
 #### `models.VolumePatchPropertiesDataProtection` was modified
 
-* `ransomwareProtection()` was added
 * `withRansomwareProtection(models.RansomwareProtectionPatchSettings)` was added
+* `ransomwareProtection()` was added
 
 #### `models.Volumes` was modified
 

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

@@ -1542,7 +1542,7 @@ public final class CachesPoolChangeSamples {
 ### Caches_Update
 
 ```java
-import com.azure.resourcemanager.netapp.models.CacheUpdate;
+import com.azure.resourcemanager.netapp.models.Cache;
 import com.azure.resourcemanager.netapp.models.CacheUpdateProperties;
 
 /**
@@ -1558,10 +1558,10 @@ public final class CachesUpdateSamples {
      * @param manager Entry point to NetAppFilesManager.
      */
     public static void cachesUpdate(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
-        manager.caches()
-            .update("myRG", "account1", "pool1", "cache1",
-                new CacheUpdate().withProperties(new CacheUpdateProperties().withSize(214748364800L)),
-                com.azure.core.util.Context.NONE);
+        Cache resource = manager.caches()
+            .getWithResponse("myRG", "account1", "pool1", "cache1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update().withProperties(new CacheUpdateProperties().withSize(214748364800L)).apply();
     }
 }
 ```

sdk/netapp/azure-resourcemanager-netapp/SAMPLE.md

@@ -136,8 +136,8 @@ CacheInner createOrUpdate(String resourceGroupName, String accountName, String p
      * @return the {@link SyncPoller} for polling of cache resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName, String accountName, String poolName,
-        String cacheName, CacheUpdate body);
+    SyncPoller<PollResult<CacheInner>, CacheInner> beginUpdate(String resourceGroupName, String accountName,
+        String poolName, String cacheName, CacheUpdate body);
 
     /**
      * Patch the specified Cache.
@@ -154,8 +154,8 @@ SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName, String
      * @return the {@link SyncPoller} for polling of cache resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName, String accountName, String poolName,
-        String cacheName, CacheUpdate body, Context context);
+    SyncPoller<PollResult<CacheInner>, CacheInner> beginUpdate(String resourceGroupName, String accountName,
+        String poolName, String cacheName, CacheUpdate body, Context context);
 
     /**
      * Patch the specified Cache.
@@ -168,9 +168,11 @@ SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName, String
      * @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 cache resource.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void update(String resourceGroupName, String accountName, String poolName, String cacheName, CacheUpdate body);
+    CacheInner update(String resourceGroupName, String accountName, String poolName, String cacheName,
+        CacheUpdate body);
 
     /**
      * Patch the specified Cache.
@@ -184,9 +186,10 @@ SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName, String
      * @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 cache resource.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void update(String resourceGroupName, String accountName, String poolName, String cacheName, CacheUpdate body,
+    CacheInner update(String resourceGroupName, String accountName, String poolName, String cacheName, CacheUpdate body,
         Context context);
 
     /**

sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/CachesClient.java

@@ -11,6 +11,8 @@
 import com.azure.resourcemanager.netapp.fluent.models.CacheInner;
 import com.azure.resourcemanager.netapp.models.Cache;
 import com.azure.resourcemanager.netapp.models.CacheProperties;
+import com.azure.resourcemanager.netapp.models.CacheUpdate;
+import com.azure.resourcemanager.netapp.models.CacheUpdateProperties;
 import com.azure.resourcemanager.netapp.models.PeeringPassphrases;
 import com.azure.resourcemanager.netapp.models.PoolChangeRequest;
 import java.util.Collections;
@@ -96,6 +98,8 @@ private com.azure.resourcemanager.netapp.NetAppFilesManager manager() {
 
     private String cacheName;
 
+    private CacheUpdate updateBody;
+
     public CacheImpl withExistingCapacityPool(String resourceGroupName, String accountName, String poolName) {
         this.resourceGroupName = resourceGroupName;
         this.accountName = accountName;
@@ -124,20 +128,21 @@ public Cache create(Context context) {
     }
 
     public CacheImpl update() {
+        this.updateBody = new CacheUpdate();
         return this;
     }
 
     public Cache apply() {
         this.innerObject = serviceManager.serviceClient()
             .getCaches()
-            .createOrUpdate(resourceGroupName, accountName, poolName, cacheName, this.innerModel(), Context.NONE);
+            .update(resourceGroupName, accountName, poolName, cacheName, updateBody, Context.NONE);
         return this;
     }
 
     public Cache apply(Context context) {
         this.innerObject = serviceManager.serviceClient()
             .getCaches()
-            .createOrUpdate(resourceGroupName, accountName, poolName, cacheName, this.innerModel(), context);
+            .update(resourceGroupName, accountName, poolName, cacheName, updateBody, context);
         return this;
     }
 
@@ -199,12 +204,26 @@ public CacheImpl withProperties(CacheProperties properties) {
     }
 
     public CacheImpl withTags(Map<String, String> tags) {
-        this.innerModel().withTags(tags);
-        return this;
+        if (isInCreateMode()) {
+            this.innerModel().withTags(tags);
+            return this;
+        } else {
+            this.updateBody.withTags(tags);
+            return this;
+        }
     }
 
     public CacheImpl withZones(List<String> zones) {
         this.innerModel().withZones(zones);
         return this;
     }
+
+    public CacheImpl withProperties(CacheUpdateProperties properties) {
+        this.updateBody.withProperties(properties);
+        return this;
+    }
+
+    private boolean isInCreateMode() {
+        return this.innerModel() == null || this.innerModel().id() == null;
+    }
 }