Skip to content

changing api versions and getting rid of is_preview #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SethHollandsworth merged 1 commit into from
Aug 3, 2023
Merged

changing api versions and getting rid of is_preview #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/confcom/azext_confcom/arm.template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
This file is a reference page for the [README](README.md) file.
This file is a reference page for the [README](README.md) file.

arm-template.json

arm-template.json
```
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
Expand Down Expand Up @@ -39,7 +40,7 @@ arm-template.json
{
"name": "[variables('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-10-01-preview",
"apiVersion": "2023-05-01",
"location": "[resourceGroup().location]",
"properties": {
"confidentialComputeProperties": {
Expand Down Expand Up @@ -108,4 +109,4 @@ arm-template.json
}
}
}
```
```
2 changes: 1 addition & 1 deletion src/confcom/azext_confcom/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ def load_command_table(self, _):
with self.command_group("confcom") as g:
g.custom_command("acipolicygen", "acipolicygen_confcom")

with self.command_group("confcom", is_preview=True):
with self.command_group("confcom"):
pass
62 changes: 31 additions & 31 deletions src/confcom/azext_confcom/tests/latest/test_confcom_arm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class PolicyGeneratingArm(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -341,7 +341,7 @@ def test_arm_template_missing_image_name(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -579,7 +579,7 @@ def test_arm_template_missing_containers(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -673,7 +673,7 @@ def test_arm_template_missing_definition(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -826,7 +826,7 @@ def test_arm_template_with_parameter_file(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -994,7 +994,7 @@ def test_arm_template_with_parameter_file_injected_env_vars(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -1164,7 +1164,7 @@ def test_arm_template_with_parameter_file_arm_config(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -1332,7 +1332,7 @@ def test_arm_template_with_parameter_file_clean_room(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -1455,7 +1455,7 @@ class PolicyDiff(unittest.TestCase):
"resources": [
{
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"name": "secret-volume-demo",
"location": "[resourceGroup().location]",
"properties": {
Expand Down Expand Up @@ -1534,7 +1534,7 @@ class PolicyDiff(unittest.TestCase):
"resources": [
{
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"name": "secret-volume-demo",
"location": "[resourceGroup().location]",
"properties": {
Expand Down Expand Up @@ -1715,7 +1715,7 @@ class PolicyGeneratingArmInfrastructureSvn(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -1838,7 +1838,7 @@ class MultiplePolicyTemplate(unittest.TestCase):
"resources": [
{
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"name": "secret-volume-demo",
"location": "[resourceGroup().location]",
"properties": {
Expand Down Expand Up @@ -1904,7 +1904,7 @@ class MultiplePolicyTemplate(unittest.TestCase):
},
{
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"name": "secret-volume-demo",
"location": "[resourceGroup().location]",
"properties": {
Expand Down Expand Up @@ -2067,7 +2067,7 @@ class PolicyGeneratingArmInitContainer(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -2253,7 +2253,7 @@ class PolicyGeneratingDisableStdioAccess(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -2400,7 +2400,7 @@ class PolicyGeneratingAllowElevated(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -2548,7 +2548,7 @@ def test_printing_existing_policy(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -2685,7 +2685,7 @@ def test_printing_existing_policy(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -2903,7 +2903,7 @@ class PolicyGeneratingArmWildcardEnvs(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -3021,7 +3021,7 @@ class PolicyGeneratingArmWildcardEnvs(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -3152,7 +3152,7 @@ class PolicyGeneratingArmWildcardEnvs(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -3293,7 +3293,7 @@ class PolicyGeneratingArmWildcardEnvs(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -3515,7 +3515,7 @@ class PolicyGeneratingEdgeCases(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -3658,7 +3658,7 @@ class PolicyGeneratingSecurityContext(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -3799,7 +3799,7 @@ class PolicyGeneratingSecurityContext(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -3951,7 +3951,7 @@ class PolicyGeneratingSecurityContext(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -4098,7 +4098,7 @@ class PolicyGeneratingSecurityContext(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -4388,7 +4388,7 @@ class PolicyGeneratingSecurityContextUserEdgeCases(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -4538,7 +4538,7 @@ class PolicyGeneratingSecurityContextUserEdgeCases(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -4688,7 +4688,7 @@ class PolicyGeneratingSecurityContextUserEdgeCases(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down Expand Up @@ -5147,7 +5147,7 @@ class PolicyGeneratingSecurityContextSeccompProfileEdgeCases(unittest.TestCase):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down
8 changes: 4 additions & 4 deletions src/confcom/azext_confcom/tests/latest/test_confcom_tar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def test_arm_template_with_parameter_file_clean_room_tar(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -285,7 +285,7 @@ def test_arm_template_mixed_mode_tar(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -494,7 +494,7 @@ def test_arm_template_with_parameter_file_clean_room_tar_invalid(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down Expand Up @@ -652,7 +652,7 @@ def test_clean_room_fake_tar_invalid(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",

"properties": {
Expand Down
2 changes: 1 addition & 1 deletion src/confcom/azext_confcom/tests/latest/test_confcom_template_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ def test_inject_policy_into_template(self):
{
"name": "[parameters('containergroupname')]",
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-04-01-preview",
"apiVersion": "2023-05-01",
"location": "[parameters('location')]",
"properties": {
"containers": [
Expand Down
2 changes: 1 addition & 1 deletion src/confcom/samples/sample-template-input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"resources": [
{
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-10-01-preview",
"apiVersion": "2023-05-01",
"name": "secret-volume-demo",
"location": "[resourceGroup().location]",
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion src/confcom/samples/sample-template-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"resources": [
{
"type": "Microsoft.ContainerInstance/containerGroups",
"apiVersion": "2022-10-01-preview",
"apiVersion": "2023-05-01",
"name": "secret-volume-demo",
"location": "[resourceGroup().location]",
"properties": {
Expand Down