Skip to content

Commit

Permalink
azure-cli: 2.65.0 -> 2.66.0 (#355163)
Browse files Browse the repository at this point in the history
  • Loading branch information
katexochen authored Nov 18, 2024
2 parents 2c8cc44 + 9d9f820 commit 760947c
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 53 deletions.
61 changes: 27 additions & 34 deletions pkgs/by-name/az/azure-cli/extensions-generated.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
},
"aks-preview": {
"pname": "aks-preview",
"version": "9.0.0b8",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b8-py2.py3-none-any.whl",
"hash": "sha256-CYRK4Cug1Y+TaK43OPPUMR9cpyHtzBz3CIb8+KgMv7g=",
"version": "13.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b1-py2.py3-none-any.whl",
"hash": "sha256-V9Ll880ec95QKoV6E5P6TQAVpsrJVaKZFkZ749+5Uss=",
"description": "Provides a preview for upcoming AKS features"
},
"akshybrid": {
Expand All @@ -78,9 +78,9 @@
},
"amg": {
"pname": "amg",
"version": "2.5.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.0-py3-none-any.whl",
"hash": "sha256-yQAtjGU/VqixCGvzPpGPO6bzJ8yEAGvnWUB4QhiH9B0=",
"version": "2.5.2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.2-py3-none-any.whl",
"hash": "sha256-T/8/ziRGiD+1MDdpUzBiHz+q4Q7/i2AG+x/6M64SxU4=",
"description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"
},
"amlfs": {
Expand Down Expand Up @@ -141,9 +141,9 @@
},
"azure-firewall": {
"pname": "azure-firewall",
"version": "1.2.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.0-py2.py3-none-any.whl",
"hash": "sha256-VGjMCbjqeRgXa16Vqjwkx62bfRtoxH0Wv1IqBT/YEeg=",
"version": "1.2.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.1-py2.py3-none-any.whl",
"hash": "sha256-xvttNUPeleAxiLuGuqCNI6eI+xIxpW7aJ92yVYsl13c=",
"description": "Manage Azure Firewall resources"
},
"azurelargeinstance": {
Expand Down Expand Up @@ -202,13 +202,6 @@
"hash": "sha256-nqYWLTf8M5C+Tc5kywXFxYgHAQTz6SpwGrR1RzVlqKk=",
"description": "Translate ARM template to executable Azure CLI scripts"
},
"compute-diagnostic-rp": {
"pname": "compute-diagnostic-rp",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/compute_diagnostic_rp-1.0.0b1-py3-none-any.whl",
"hash": "sha256-gQ6TzgDH0D322poPr1e5ZvttpYIxH5yudLK34ePEFCM=",
"description": "Microsoft Azure Command-Line Tools ComputeDiagnosticRp Extension"
},
"confidentialledger": {
"pname": "confidentialledger",
"version": "1.0.0",
Expand Down Expand Up @@ -309,9 +302,9 @@
},
"dataprotection": {
"pname": "dataprotection",
"version": "1.5.4",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.4-py3-none-any.whl",
"hash": "sha256-vAyVrv0dte1KioEwriEF8oNqrEwN3WSKDC/hyTudQtg=",
"version": "1.5.5",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.5-py3-none-any.whl",
"hash": "sha256-DsYp2y2HQd+PVNJVuyJepEHgBuGGc8Cg5GEwZWJVcPk=",
"description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension"
},
"datashare": {
Expand Down Expand Up @@ -547,9 +540,9 @@
},
"image-copy-extension": {
"pname": "image-copy-extension",
"version": "0.2.13",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-0.2.13-py2.py3-none-any.whl",
"hash": "sha256-sNEr88dFAHkNWNmabDJWJUhxLLhyt5QuitSB4nBSGxk=",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.0-py2.py3-none-any.whl",
"hash": "sha256-4RO7FHmyQdJd0GY0OqdF9wxYFq5U4sAXYczPFgOUX9g=",
"description": "Support for copying managed vm images between regions"
},
"image-gallery": {
Expand Down Expand Up @@ -722,9 +715,9 @@
},
"multicloud-connector": {
"pname": "multicloud-connector",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0-py3-none-any.whl",
"hash": "sha256-8Gb946+K7DwMm5s5GROUciYRkvYvxgB7rB5Y3MRn5t8=",
"version": "1.0.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.1-py3-none-any.whl",
"hash": "sha256-q5tuqnN94FS1opr9oLx2LHFYuFX6PTDaBmuvrByXTsI=",
"description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension"
},
"neon": {
Expand All @@ -743,9 +736,9 @@
},
"networkcloud": {
"pname": "networkcloud",
"version": "2.0.0b5",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b5-py3-none-any.whl",
"hash": "sha256-rHLPxU7TWDTKbNXHJ6D91x5JQ7zWbmXND/YH6K5JXHo=",
"version": "2.0.0b6",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b6-py3-none-any.whl",
"hash": "sha256-1T+IepVTU7DLHQ7CfcEltQG+/lryktzUFB7RY9O9hzM=",
"description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version"
},
"new-relic": {
Expand Down Expand Up @@ -1065,16 +1058,16 @@
},
"virtual-network-manager": {
"pname": "virtual-network-manager",
"version": "1.3.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-1.3.0-py3-none-any.whl",
"hash": "sha256-8W+ZL5j9A8AdzvikD5uE3iNn/56IULSGY6m7HLVbe9Q=",
"version": "1.3.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-1.3.1-py3-none-any.whl",
"hash": "sha256-y5VTXAV6YZk4S8nlwwqZQtvFic8M6tsqYtJqp/cNTh0=",
"description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension"
},
"virtual-network-tap": {
"pname": "virtual-network-tap",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-1.0.0b1-py2.py3-none-any.whl",
"hash": "sha256-7l9tz8CfwJ4MO704a007xswfij3ejtVQgE9D7Uw8t7o=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-1.0.0b2-py2.py3-none-any.whl",
"hash": "sha256-h5yPHrfrkt4+ZzlH/gvGJuK23y7oF1yW/zYmxDW4Gx4=",
"description": "Manage virtual network taps (VTAP)"
},
"virtual-wan": {
Expand Down
1 change: 1 addition & 0 deletions pkgs/by-name/az/azure-cli/extensions-manual.nix
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,6 @@
# Removed extensions
adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038
blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370
compute-diagnostic-rp = throw "The 'compute-diagnostic-rp' extension for azure-cli was deprecated upstream"; # Added 2024-11-12, https://github.com/Azure/azure-cli-extensions/pull/8240
connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194
}
10 changes: 6 additions & 4 deletions pkgs/by-name/az/azure-cli/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
runCommand,
installShellFiles,
python3,
writeScriptBin,
writeShellScriptBin,

black,
isort,
Expand All @@ -26,14 +26,14 @@
}:

let
version = "2.65.0";
version = "2.66.0";

src = fetchFromGitHub {
name = "azure-cli-${version}-src";
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
hash = "sha256-IeiAB0AI6KNpXwx2Iv55LBARcwemakbblFlbfLheuGE=";
hash = "sha256-iWDKvtEvH6ZwK+5Zp9P2fgXP+4f4kXH+xXfBkYmsPl0=";
};

# put packages that needs to be overridden in the py package scope
Expand Down Expand Up @@ -169,8 +169,10 @@ py.pkgs.toPythonApplication (
azure-mgmt-media
azure-mgmt-monitor
azure-mgmt-msi
azure-mgmt-mysqlflexibleservers
azure-mgmt-netapp
azure-mgmt-policyinsights
azure-mgmt-postgresqlflexibleservers
azure-mgmt-privatedns
azure-mgmt-rdbms
azure-mgmt-recoveryservicesbackup
Expand Down Expand Up @@ -385,7 +387,7 @@ py.pkgs.toPythonApplication (
inherit (azure-cli) extensions-tool;
};

generate-extensions = writeScriptBin "${pname}-update-extensions" ''
generate-extensions = writeShellScriptBin "${pname}-update-extensions" ''
${lib.getExe azure-cli.extensions-tool} --cli-version ${azure-cli.version} --commit
'';

Expand Down
21 changes: 6 additions & 15 deletions pkgs/by-name/az/azure-cli/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ let
--ignore=azure/cli/core/tests/test_generic_update.py \
--ignore=azure/cli/core/tests/test_cloud.py \
--ignore=azure/cli/core/tests/test_extension.py \
--ignore=azure/cli/core/tests/test_util.py \
-k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell'
'';

Expand Down Expand Up @@ -136,11 +137,6 @@ let
overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
"sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";

# ImportError: cannot import name 'SqlDedicatedGatewayServiceResourceCreateUpdateProperties' from 'azure.mgmt.cosmosdb.models'
azure-mgmt-cosmosdb =
overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.5.1" "tar.gz"
"sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI=";

# ValueError: The operation 'azure.mgmt.devtestlabs.operations#VirtualMachinesOperations.delete' is invalid.
azure-mgmt-devtestlabs =
overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
Expand Down Expand Up @@ -175,18 +171,13 @@ let

# AttributeError: module 'azure.mgmt.rdbms.postgresql_flexibleservers.operations' has no attribute 'BackupsOperations'
azure-mgmt-rdbms =
overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b16" "tar.gz"
"sha256-HDktzv8MOs5VRQArbS3waMhjbwVgZMmvch7PXen5DjE=";

# ModuleNotFoundError: No module named 'azure.mgmt.resource.deploymentstacks'
azure-mgmt-resource =
overrideAzureMgmtPackage super.azure-mgmt-resource "23.1.1" "tar.gz"
"sha256-ILawBrVE/bGWB/P2o4EQViXgu2D78wNvOYhcRkbTND4=";
overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b17" "tar.gz"
"sha256-1nnRkyr4Im79B7DDqGz/FOrPAToFaGhE+a7r5bZMuOQ=";

# ImportError: cannot import name 'Replica' from 'azure.mgmt.signalr.models'
# ImportError: cannot import name 'IPRule' from 'azure.mgmt.signalr.models'
azure-mgmt-signalr =
overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b1" "tar.gz"
"sha256-oK2ceBEoQ7gAeG6mye+x8HPzQU9bUNRPVJtRW2GL4xg=";
overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b2" "tar.gz"
"sha256-05PUV8ouAKq/xhGxVEWIzDop0a7WDTV5mGVSC4sv9P4=";

# ImportError: cannot import name 'AdvancedThreatProtectionName' from 'azure.mgmt.sql.models'
azure-mgmt-sql =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
wheel,
azure-common,
azure-mgmt-core,
isodate,
typing-extensions,
}:

buildPythonPackage rec {
pname = "azure-mgmt-mysqlflexibleservers";
version = "1.0.0b2";
pyproject = true;

src = fetchPypi {
pname = "azure_mgmt_mysqlflexibleservers";
inherit version;
hash = "sha256-pL3z3s/H7OYaPiGNGdUIzo3ppp6sR/G+6iDB219Mp9A=";
};

build-system = [
setuptools
wheel
];

dependencies = [
azure-common
azure-mgmt-core
isodate
typing-extensions
];

pythonImportsCheck = [
"azure.mgmt.mysqlflexibleservers"
];

meta = {
description = "Microsoft Azure Mysqlflexibleservers Management Client Library for Python";
homepage = "https://pypi.org/project/azure-mgmt-mysqlflexibleservers/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
wheel,
azure-common,
azure-mgmt-core,
isodate,
typing-extensions,
}:

buildPythonPackage rec {
pname = "azure-mgmt-postgresqlflexibleservers";
version = "1.0.0";
pyproject = true;

src = fetchPypi {
pname = "azure_mgmt_postgresqlflexibleservers";
inherit version;
hash = "sha256-5aSpnUCTol+L1w7XZp6d2QRN+LxGOpUUztiMQqkD55E=";
};

build-system = [
setuptools
wheel
];

dependencies = [
azure-common
azure-mgmt-core
isodate
typing-extensions
];

pythonImportsCheck = [
"azure.mgmt.postgresqlflexibleservers"
];

meta = {
description = "Microsoft Azure Postgresqlflexibleservers Management Client Library for Python";
homepage = "https://pypi.org/project/azure-mgmt-postgresqlflexibleservers/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,8 @@ self: super: with self; {

azure-mgmt-msi = callPackage ../development/python-modules/azure-mgmt-msi { };

azure-mgmt-mysqlflexibleservers = callPackage ../development/python-modules/azure-mgmt-mysqlflexibleservers { };

azure-mgmt-netapp = callPackage ../development/python-modules/azure-mgmt-netapp { };

azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { };
Expand All @@ -1289,6 +1291,8 @@ self: super: with self; {

azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { };

azure-mgmt-postgresqlflexibleservers = callPackage ../development/python-modules/azure-mgmt-postgresqlflexibleservers { };

azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { };

azure-mgmt-privatedns = callPackage ../development/python-modules/azure-mgmt-privatedns { };
Expand Down

0 comments on commit 760947c

Please sign in to comment.