Merge pull request #336 from Azure/ipam-3.5.0

Azure IPAM v3.5.0 Updated Release

deploy/modules/containerRegistry.bicep

@@ -7,11 +7,9 @@ param containerRegistryName string
 @description('Managed Identity PrincipalId')
 param principalId string
 
-@description('Role Assignment GUID')
-param roleAssignmentName string = newGuid()
-
 var acrPull = '7f951dda-4ed3-4680-a7ca-43fe172d538d'
 var acrPullId = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', acrPull)
+var acrPullRoleAssignmentId = guid(subscription().id, acrPull, principalId)
 
 resource containerRegistry 'Microsoft.ContainerRegistry/registries@2021-12-01-preview' = {
   name: containerRegistryName
@@ -22,8 +20,7 @@ resource containerRegistry 'Microsoft.ContainerRegistry/registries@2021-12-01-pr
 }
 
 resource roleAssignment 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = {
-  #disable-next-line use-stable-resource-identifiers
-  name: roleAssignmentName
+  name: acrPullRoleAssignmentId
   scope: containerRegistry
   properties: {
     principalType: 'ServicePrincipal'

deploy/modules/managedIdentity.bicep

@@ -6,10 +6,10 @@ param managedIdentityName string
 
 var contributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c'
 var contributorId = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', contributor)
-var contributorRoleAssignmentId = guid(contributor, managedIdentity.id, subscription().id)
+var contributorRoleAssignmentId = guid(subscription().id, contributor, managedIdentity.id)
 var managedIdentityOperator = 'f1a07417-d97a-45cb-824c-7a7467783830'
 var managedIdentityOperatorId = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', managedIdentityOperator)
-var managedIdentityOperatorRoleAssignmentId = guid(managedIdentityOperator, managedIdentity.id, subscription().id)
+var managedIdentityOperatorRoleAssignmentId = guid(subscription().id, managedIdentityOperator, managedIdentity.id)
 
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
   name: managedIdentityName

engine/app/routers/space.py

@@ -1815,7 +1815,7 @@ async def create_external_network(
             block_net_cidrs += prefixes
 
     block_set = IPSet(block_net_cidrs)
-    resv_set = IPSet(x['cidr'] for x in target_block['resv'])
+    resv_set = IPSet(x['cidr'] for x in target_block['resv'] if not x['settledOn'])
     external_set = IPSet(x['cidr'] for x in target_block['externals'])
     available_set = IPSet([target_block['cidr']]) ^ (resv_set | external_set | block_set)
 

ui/eslint.config.js

@@ -0,0 +1,45 @@
+import js from "@eslint/js";
+import globals from "globals";
+
+import react from "eslint-plugin-react";
+import hooks from "eslint-plugin-react-hooks";
+import jest from "eslint-plugin-jest";
+
+export default [
+  js.configs.recommended,
+  {
+    files: ["src/**/*.jsx"],
+    plugins: {
+      react,
+      "react-hooks": hooks,
+      jest
+    },
+    settings: {
+      react: {
+        version: "detect",
+      }
+    },
+    languageOptions: {
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+      },
+      globals: {
+        ...globals.node,
+        ...globals.browser,
+        ...globals.jest
+      }
+    },
+    rules: {
+      "no-unused-vars": "off",
+      "no-prototype-builtins": "off",
+      "react/prop-types": "off",
+      "react/display-name": "off",
+      "react/no-unescaped-entities": "off",
+      "no-constant-binary-expression": "off"
+    },
+  },
+];