mgmt, local generation for Storage - 2025-01-01 (#46366)

* generate codes

* update changelog

* update test case

* update assets.json

* remove unused model and update assets.json

* rollback fixed test case and update assets.json

Author: v-hongli1

sdk/resourcemanager/api-specs.json

@@ -265,7 +265,7 @@
     "dir": "azure-resourcemanager-storage",
     "source": "specification/storage/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.storage",
-    "args": "--tag=package-2024-01 --modelerfour.lenient-model-deduplication --rename-model=AllowedMethods:CorsRuleAllowedMethodsItem,AccountType:ActiveDirectoryPropertiesAccountType --property-include-always=EncryptionIdentity.encryptionUserAssignedIdentity --enable-sync-stack=false"
+    "args": "--tag=package-2025-01 --modelerfour.lenient-model-deduplication --rename-model=AllowedMethods:CorsRuleAllowedMethodsItem,AccountType:ActiveDirectoryPropertiesAccountType --property-include-always=EncryptionIdentity.encryptionUserAssignedIdentity --enable-sync-stack=false"
   },
   "storage-hybrid": {
     "dir": "../resourcemanagerhybrid/azure-resourcemanager-storage",

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

@@ -2,13 +2,11 @@
 
 ## 2.54.0-beta.1 (Unreleased)
 
-### Features Added
-
-### Breaking Changes
+### Other Changes
 
-### Bugs Fixed
+#### Dependency Updates
 
-### Other Changes
+- Updated `api-version` to `2025-01-01`.
 
 ## 2.53.1 (2025-08-05)
 

sdk/resourcemanager/azure-resourcemanager-storage/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/resourcemanager/azure-resourcemanager-storage",
-  "Tag": "java/resourcemanager/azure-resourcemanager-storage_3df9762af1"
+  "Tag": "java/resourcemanager/azure-resourcemanager-storage_db3498f65d"
 }

sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/fluent/models/SkuInformationInner.java

@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.storage.models.Kind;
 import com.azure.resourcemanager.storage.models.Restriction;
 import com.azure.resourcemanager.storage.models.SkuCapability;
+import com.azure.resourcemanager.storage.models.SkuInformationLocationInfoItem;
 import com.azure.resourcemanager.storage.models.SkuName;
 import com.azure.resourcemanager.storage.models.SkuTier;
 import java.io.IOException;
@@ -50,6 +51,11 @@ public final class SkuInformationInner implements JsonSerializable<SkuInformatio
      */
     private List<String> locations;
 
+    /*
+     * The locationInfo property.
+     */
+    private List<SkuInformationLocationInfoItem> locationInfo;
+
     /*
      * The capability information in the specified SKU, including file encryption, network ACLs, change notification,
      * etc.
@@ -126,6 +132,26 @@ public List<String> locations() {
         return this.locations;
     }
 
+    /**
+     * Get the locationInfo property: The locationInfo property.
+     * 
+     * @return the locationInfo value.
+     */
+    public List<SkuInformationLocationInfoItem> locationInfo() {
+        return this.locationInfo;
+    }
+
+    /**
+     * Set the locationInfo property: The locationInfo property.
+     * 
+     * @param locationInfo the locationInfo value to set.
+     * @return the SkuInformationInner object itself.
+     */
+    public SkuInformationInner withLocationInfo(List<SkuInformationLocationInfoItem> locationInfo) {
+        this.locationInfo = locationInfo;
+        return this;
+    }
+
     /**
      * Get the capabilities property: The capability information in the specified SKU, including file encryption,
      * network ACLs, change notification, etc.
@@ -168,6 +194,9 @@ public void validate() {
             throw LOGGER.atError()
                 .log(new IllegalArgumentException("Missing required property name in model SkuInformationInner"));
         }
+        if (locationInfo() != null) {
+            locationInfo().forEach(e -> e.validate());
+        }
         if (capabilities() != null) {
             capabilities().forEach(e -> e.validate());
         }
@@ -185,6 +214,7 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("name", this.name == null ? null : this.name.toString());
+        jsonWriter.writeArrayField("locationInfo", this.locationInfo, (writer, element) -> writer.writeJson(element));
         jsonWriter.writeArrayField("restrictions", this.restrictions, (writer, element) -> writer.writeJson(element));
         return jsonWriter.writeEndObject();
     }
@@ -216,6 +246,10 @@ public static SkuInformationInner fromJson(JsonReader jsonReader) throws IOExcep
                 } else if ("locations".equals(fieldName)) {
                     List<String> locations = reader.readArray(reader1 -> reader1.getString());
                     deserializedSkuInformationInner.locations = locations;
+                } else if ("locationInfo".equals(fieldName)) {
+                    List<SkuInformationLocationInfoItem> locationInfo
+                        = reader.readArray(reader1 -> SkuInformationLocationInfoItem.fromJson(reader1));
+                    deserializedSkuInformationInner.locationInfo = locationInfo;
                 } else if ("capabilities".equals(fieldName)) {
                     List<SkuCapability> capabilities = reader.readArray(reader1 -> SkuCapability.fromJson(reader1));
                     deserializedSkuInformationInner.capabilities = capabilities;

sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/fluent/models/StorageAccountInner.java

@@ -15,6 +15,7 @@
 import com.azure.resourcemanager.storage.models.AzureFilesIdentityBasedAuthentication;
 import com.azure.resourcemanager.storage.models.CustomDomain;
 import com.azure.resourcemanager.storage.models.DnsEndpointType;
+import com.azure.resourcemanager.storage.models.DualStackEndpointPreference;
 import com.azure.resourcemanager.storage.models.Encryption;
 import com.azure.resourcemanager.storage.models.Endpoints;
 import com.azure.resourcemanager.storage.models.ExtendedLocation;
@@ -27,6 +28,7 @@
 import com.azure.resourcemanager.storage.models.LargeFileSharesState;
 import com.azure.resourcemanager.storage.models.MinimumTlsVersion;
 import com.azure.resourcemanager.storage.models.NetworkRuleSet;
+import com.azure.resourcemanager.storage.models.Placement;
 import com.azure.resourcemanager.storage.models.ProvisioningState;
 import com.azure.resourcemanager.storage.models.PublicNetworkAccess;
 import com.azure.resourcemanager.storage.models.RoutingPreference;
@@ -63,6 +65,16 @@ public final class StorageAccountInner extends Resource {
      */
     private ExtendedLocation extendedLocation;
 
+    /*
+     * Optional. Gets or sets the pinned logical availability zone for the storage account.
+     */
+    private List<String> zones;
+
+    /*
+     * Optional. Gets or sets the zonal placement details for the storage account.
+     */
+    private Placement placement;
+
     /*
      * Properties of the storage account.
      */
@@ -147,6 +159,46 @@ public StorageAccountInner withExtendedLocation(ExtendedLocation extendedLocatio
         return this;
     }
 
+    /**
+     * Get the zones property: Optional. Gets or sets the pinned logical availability zone for the storage account.
+     * 
+     * @return the zones value.
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set the zones property: Optional. Gets or sets the pinned logical availability zone for the storage account.
+     * 
+     * @param zones the zones value to set.
+     * @return the StorageAccountInner object itself.
+     */
+    public StorageAccountInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get the placement property: Optional. Gets or sets the zonal placement details for the storage account.
+     * 
+     * @return the placement value.
+     */
+    public Placement placement() {
+        return this.placement;
+    }
+
+    /**
+     * Set the placement property: Optional. Gets or sets the zonal placement details for the storage account.
+     * 
+     * @param placement the placement value to set.
+     * @return the StorageAccountInner object itself.
+     */
+    public StorageAccountInner withPlacement(Placement placement) {
+        this.placement = placement;
+        return this;
+    }
+
     /**
      * Get the innerProperties property: Properties of the storage account.
      * 
@@ -578,6 +630,32 @@ public StorageAccountInner withRoutingPreference(RoutingPreference routingPrefer
         return this;
     }
 
+    /**
+     * Get the dualStackEndpointPreference property: Maintains information about the Internet protocol opted by the
+     * user.
+     * 
+     * @return the dualStackEndpointPreference value.
+     */
+    public DualStackEndpointPreference dualStackEndpointPreference() {
+        return this.innerProperties() == null ? null : this.innerProperties().dualStackEndpointPreference();
+    }
+
+    /**
+     * Set the dualStackEndpointPreference property: Maintains information about the Internet protocol opted by the
+     * user.
+     * 
+     * @param dualStackEndpointPreference the dualStackEndpointPreference value to set.
+     * @return the StorageAccountInner object itself.
+     */
+    public StorageAccountInner
+        withDualStackEndpointPreference(DualStackEndpointPreference dualStackEndpointPreference) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new StorageAccountPropertiesInner();
+        }
+        this.innerProperties().withDualStackEndpointPreference(dualStackEndpointPreference);
+        return this;
+    }
+
     /**
      * Get the blobRestoreStatus property: Blob restore status.
      * 
@@ -907,6 +985,9 @@ public void validate() {
         if (extendedLocation() != null) {
             extendedLocation().validate();
         }
+        if (placement() != null) {
+            placement().validate();
+        }
         if (innerProperties() != null) {
             innerProperties().validate();
         }
@@ -922,6 +1003,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element));
         jsonWriter.writeJsonField("identity", this.identity);
         jsonWriter.writeJsonField("extendedLocation", this.extendedLocation);
+        jsonWriter.writeArrayField("zones", this.zones, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("placement", this.placement);
         jsonWriter.writeJsonField("properties", this.innerProperties);
         return jsonWriter.writeEndObject();
     }
@@ -961,6 +1044,11 @@ public static StorageAccountInner fromJson(JsonReader jsonReader) throws IOExcep
                     deserializedStorageAccountInner.identity = Identity.fromJson(reader);
                 } else if ("extendedLocation".equals(fieldName)) {
                     deserializedStorageAccountInner.extendedLocation = ExtendedLocation.fromJson(reader);
+                } else if ("zones".equals(fieldName)) {
+                    List<String> zones = reader.readArray(reader1 -> reader1.getString());
+                    deserializedStorageAccountInner.zones = zones;
+                } else if ("placement".equals(fieldName)) {
+                    deserializedStorageAccountInner.placement = Placement.fromJson(reader);
                 } else if ("properties".equals(fieldName)) {
                     deserializedStorageAccountInner.innerProperties = StorageAccountPropertiesInner.fromJson(reader);
                 } else {

sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/fluent/models/StorageAccountMigrationInner.java

@@ -36,7 +36,7 @@ public final class StorageAccountMigrationInner implements JsonSerializable<Stor
     private String type;
 
     /*
-     * The properties of a storage account’s ongoing or enqueued migration.
+     * The properties of a storage account's ongoing or enqueued migration.
      */
     private StorageAccountMigrationProperties innerStorageAccountMigrationDetails
         = new StorageAccountMigrationProperties();
@@ -97,7 +97,7 @@ public StorageAccountMigrationInner withType(String type) {
     }
 
     /**
-     * Get the innerStorageAccountMigrationDetails property: The properties of a storage account’s ongoing or enqueued
+     * Get the innerStorageAccountMigrationDetails property: The properties of a storage account's ongoing or enqueued
      * migration.
      * 
      * @return the innerStorageAccountMigrationDetails value.

sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/fluent/models/StorageAccountMigrationProperties.java

@@ -15,7 +15,7 @@
 import java.io.IOException;
 
 /**
- * The properties of a storage account’s ongoing or enqueued migration.
+ * The properties of a storage account's ongoing or enqueued migration.
  */
 @Fluent
 public final class StorageAccountMigrationProperties implements JsonSerializable<StorageAccountMigrationProperties> {

sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/fluent/models/StorageAccountPropertiesCreateParameters.java

@@ -14,6 +14,7 @@
 import com.azure.resourcemanager.storage.models.AzureFilesIdentityBasedAuthentication;
 import com.azure.resourcemanager.storage.models.CustomDomain;
 import com.azure.resourcemanager.storage.models.DnsEndpointType;
+import com.azure.resourcemanager.storage.models.DualStackEndpointPreference;
 import com.azure.resourcemanager.storage.models.Encryption;
 import com.azure.resourcemanager.storage.models.ImmutableStorageAccount;
 import com.azure.resourcemanager.storage.models.KeyPolicy;
@@ -117,6 +118,11 @@ public final class StorageAccountPropertiesCreateParameters
      */
     private RoutingPreference routingPreference;
 
+    /*
+     * Maintains information about the Internet protocol opted by the user.
+     */
+    private DualStackEndpointPreference dualStackEndpointPreference;
+
     /*
      * Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is
      * false for this property.
@@ -517,6 +523,29 @@ public StorageAccountPropertiesCreateParameters withRoutingPreference(RoutingPre
         return this;
     }
 
+    /**
+     * Get the dualStackEndpointPreference property: Maintains information about the Internet protocol opted by the
+     * user.
+     * 
+     * @return the dualStackEndpointPreference value.
+     */
+    public DualStackEndpointPreference dualStackEndpointPreference() {
+        return this.dualStackEndpointPreference;
+    }
+
+    /**
+     * Set the dualStackEndpointPreference property: Maintains information about the Internet protocol opted by the
+     * user.
+     * 
+     * @param dualStackEndpointPreference the dualStackEndpointPreference value to set.
+     * @return the StorageAccountPropertiesCreateParameters object itself.
+     */
+    public StorageAccountPropertiesCreateParameters
+        withDualStackEndpointPreference(DualStackEndpointPreference dualStackEndpointPreference) {
+        this.dualStackEndpointPreference = dualStackEndpointPreference;
+        return this;
+    }
+
     /**
      * Get the allowBlobPublicAccess property: Allow or disallow public access to all blobs or containers in the storage
      * account. The default interpretation is false for this property.
@@ -731,6 +760,9 @@ public void validate() {
         if (routingPreference() != null) {
             routingPreference().validate();
         }
+        if (dualStackEndpointPreference() != null) {
+            dualStackEndpointPreference().validate();
+        }
         if (immutableStorageWithVersioning() != null) {
             immutableStorageWithVersioning().validate();
         }
@@ -761,6 +793,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("largeFileSharesState",
             this.largeFileSharesState == null ? null : this.largeFileSharesState.toString());
         jsonWriter.writeJsonField("routingPreference", this.routingPreference);
+        jsonWriter.writeJsonField("dualStackEndpointPreference", this.dualStackEndpointPreference);
         jsonWriter.writeBooleanField("allowBlobPublicAccess", this.allowBlobPublicAccess);
         jsonWriter.writeStringField("minimumTlsVersion",
             this.minimumTlsVersion == null ? null : this.minimumTlsVersion.toString());
@@ -834,6 +867,9 @@ public static StorageAccountPropertiesCreateParameters fromJson(JsonReader jsonR
                 } else if ("routingPreference".equals(fieldName)) {
                     deserializedStorageAccountPropertiesCreateParameters.routingPreference
                         = RoutingPreference.fromJson(reader);
+                } else if ("dualStackEndpointPreference".equals(fieldName)) {
+                    deserializedStorageAccountPropertiesCreateParameters.dualStackEndpointPreference
+                        = DualStackEndpointPreference.fromJson(reader);
                 } else if ("allowBlobPublicAccess".equals(fieldName)) {
                     deserializedStorageAccountPropertiesCreateParameters.allowBlobPublicAccess
                         = reader.getNullable(JsonReader::getBoolean);