Skip to content

Commit ca47b93

Browse files
author
Rachid Cesin Gorostieta
committed
Merge with upstream dev
2 parents 0763960 + b30b857 commit ca47b93

File tree

9 files changed

+66
-412
lines changed

9 files changed

+66
-412
lines changed

‎src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<Compile Include="ScenarioTests\ResourceTests.cs" />
209209
<Compile Include="ScenarioTests\RoleAssignmentTests.cs" />
210210
<Compile Include="ScenarioTests\RoleDefinitionTests.cs" />
211-
<Compile Include="Templates\TestAzureResourceGroupTemplateCommandTests.cs" />
211+
<Compile Include="ResourceGroupDeployments\TestAzureResourceGroupDeploymentCommandTests.cs" />
212212
<Compile Include="Models.ResourceGroups\ResourceClientTests.cs" />
213213
<Compile Include="Properties\Resources.Designer.cs">
214214
<AutoGen>True</AutoGen>

‎src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCommandTests.cs

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ public void CreatesNewPSResourceGroupDeploymentWithUserTemplate()
5959
{
6060
TemplateFile = templateFile,
6161
DeploymentName = deploymentName,
62-
StorageAccountName = storageAccountName,
63-
TemplateVersion = "1.0"
6462
};
6563
CreatePSResourceGroupDeploymentParameters actualParameters = new CreatePSResourceGroupDeploymentParameters();
6664
PSResourceGroupDeployment expected = new PSResourceGroupDeployment()
@@ -97,75 +95,12 @@ public void CreatesNewPSResourceGroupDeploymentWithUserTemplate()
9795
cmdlet.ResourceGroupName = resourceGroupName;
9896
cmdlet.Name = expectedParameters.DeploymentName;
9997
cmdlet.TemplateFile = expectedParameters.TemplateFile;
100-
cmdlet.TemplateVersion = expectedParameters.TemplateVersion;
10198

10299
cmdlet.ExecuteCmdlet();
103100

104101
Assert.Equal(expectedParameters.DeploymentName, actualParameters.DeploymentName);
105-
Assert.Equal(expectedParameters.GalleryTemplateIdentity, actualParameters.GalleryTemplateIdentity);
106102
Assert.Equal(expectedParameters.TemplateFile, actualParameters.TemplateFile);
107103
Assert.NotNull(actualParameters.TemplateParameterObject);
108-
Assert.Equal(expectedParameters.TemplateVersion, actualParameters.TemplateVersion);
109-
110-
commandRuntimeMock.Verify(f => f.WriteObject(expected), Times.Once());
111-
}
112-
113-
[Fact]
114-
[Trait(Category.AcceptanceType, Category.CheckIn)]
115-
public void CreatesNewPSResourceGroupDeploymentWithGalleryTemplate()
116-
{
117-
CreatePSResourceGroupDeploymentParameters expectedParameters = new CreatePSResourceGroupDeploymentParameters()
118-
{
119-
GalleryTemplateIdentity = "sqlServer",
120-
DeploymentName = deploymentName,
121-
StorageAccountName = storageAccountName,
122-
TemplateVersion = "1.0"
123-
};
124-
CreatePSResourceGroupDeploymentParameters actualParameters = new CreatePSResourceGroupDeploymentParameters();
125-
PSResourceGroupDeployment expected = new PSResourceGroupDeployment()
126-
{
127-
Mode = DeploymentMode.Incremental,
128-
DeploymentName = deploymentName,
129-
CorrelationId = "123",
130-
Outputs = new Dictionary<string, DeploymentVariable>()
131-
{
132-
{ "Variable1", new DeploymentVariable() { Value = "true", Type = "bool" } },
133-
{ "Variable2", new DeploymentVariable() { Value = "10", Type = "int" } },
134-
{ "Variable3", new DeploymentVariable() { Value = "hello world", Type = "string" } }
135-
},
136-
Parameters = new Dictionary<string, DeploymentVariable>()
137-
{
138-
{ "Parameter1", new DeploymentVariable() { Value = "true", Type = "bool" } },
139-
{ "Parameter2", new DeploymentVariable() { Value = "10", Type = "int" } },
140-
{ "Parameter3", new DeploymentVariable() { Value = "hello world", Type = "string" } }
141-
},
142-
ProvisioningState = ProvisioningState.Succeeded,
143-
ResourceGroupName = resourceGroupName,
144-
TemplateLink = new TemplateLink()
145-
{
146-
ContentVersion = "1.0",
147-
Uri = new Uri("http://mytemplate.com")
148-
},
149-
Timestamp = new DateTime(2014, 2, 13)
150-
};
151-
resourcesClientMock.Setup(f => f.ExecuteDeployment(
152-
It.IsAny<CreatePSResourceGroupDeploymentParameters>()))
153-
.Returns(expected)
154-
.Callback((CreatePSResourceGroupDeploymentParameters p) => { actualParameters = p; });
155-
156-
cmdlet.ResourceGroupName = resourceGroupName;
157-
cmdlet.Name = expectedParameters.DeploymentName;
158-
cmdlet.GalleryTemplateIdentity = expectedParameters.GalleryTemplateIdentity;
159-
cmdlet.TemplateVersion = expectedParameters.TemplateVersion;
160-
161-
cmdlet.ExecuteCmdlet();
162-
163-
Assert.Equal(expectedParameters.DeploymentName, actualParameters.DeploymentName);
164-
Assert.Equal(expectedParameters.GalleryTemplateIdentity, actualParameters.GalleryTemplateIdentity);
165-
Assert.Equal(expectedParameters.TemplateFile, actualParameters.TemplateFile);
166-
Assert.NotNull(actualParameters.TemplateParameterObject);
167-
Assert.Equal(expectedParameters.TemplateVersion, actualParameters.TemplateVersion);
168-
Assert.Equal(null, actualParameters.StorageAccountName);
169104

170105
commandRuntimeMock.Verify(f => f.WriteObject(expected), Times.Once());
171106
}

‎src/ResourceManager/Resources/Commands.Resources.Test/Templates/TestAzureResourceGroupTemplateCommandTests.cs renamed to ‎src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/TestAzureResourceGroupDeploymentCommandTests.cs

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
namespace Microsoft.Azure.Commands.Resources.Test.Resources
2525
{
26-
public class TestAzureResourceGroupTemplateCommandTests
26+
public class TestAzureResourceGroupDeploymentCommandTests
2727
{
28-
private TestAzureResourceGroupTemplateCommand cmdlet;
28+
private TestAzureResourceGroupDeploymentCommand cmdlet;
2929

3030
private Mock<ResourcesClient> resourcesClientMock;
3131

@@ -35,13 +35,11 @@ public class TestAzureResourceGroupTemplateCommandTests
3535

3636
private string templateFile = @"Resources\sampleTemplateFile.json";
3737

38-
private string storageAccountName = "myStorageAccount";
39-
40-
public TestAzureResourceGroupTemplateCommandTests()
38+
public TestAzureResourceGroupDeploymentCommandTests()
4139
{
4240
resourcesClientMock = new Mock<ResourcesClient>();
4341
commandRuntimeMock = new Mock<ICommandRuntime>();
44-
cmdlet = new TestAzureResourceGroupTemplateCommand()
42+
cmdlet = new TestAzureResourceGroupDeploymentCommand()
4543
{
4644
CommandRuntime = commandRuntimeMock.Object,
4745
ResourcesClient = resourcesClientMock.Object
@@ -53,9 +51,7 @@ public void ValidatesPSResourceGroupDeploymentWithUserTemplate()
5351
{
5452
ValidatePSResourceGroupDeploymentParameters expectedParameters = new ValidatePSResourceGroupDeploymentParameters()
5553
{
56-
TemplateFile = templateFile,
57-
StorageAccountName = storageAccountName,
58-
TemplateVersion = "1.0"
54+
TemplateFile = templateFile
5955
};
6056
ValidatePSResourceGroupDeploymentParameters actualParameters = new ValidatePSResourceGroupDeploymentParameters();
6157
List<PSResourceManagerError> expected = new List<PSResourceManagerError>()
@@ -83,63 +79,11 @@ public void ValidatesPSResourceGroupDeploymentWithUserTemplate()
8379

8480
cmdlet.ResourceGroupName = resourceGroupName;
8581
cmdlet.TemplateFile = expectedParameters.TemplateFile;
86-
cmdlet.TemplateVersion = expectedParameters.TemplateVersion;
87-
88-
cmdlet.ExecuteCmdlet();
89-
90-
Assert.Equal(expectedParameters.GalleryTemplateIdentity, actualParameters.GalleryTemplateIdentity);
91-
Assert.Equal(expectedParameters.TemplateFile, actualParameters.TemplateFile);
92-
Assert.NotNull(actualParameters.TemplateParameterObject);
93-
Assert.Equal(expectedParameters.TemplateVersion, actualParameters.TemplateVersion);
94-
Assert.Equal(null, actualParameters.StorageAccountName);
95-
96-
commandRuntimeMock.Verify(f => f.WriteObject(expected), Times.Once());
97-
}
98-
99-
[Fact]
100-
public void ValidatesPSResourceGroupDeploymentWithGalleryTemplate()
101-
{
102-
ValidatePSResourceGroupDeploymentParameters expectedParameters = new ValidatePSResourceGroupDeploymentParameters()
103-
{
104-
GalleryTemplateIdentity = "sqlServer",
105-
StorageAccountName = storageAccountName,
106-
TemplateVersion = "1.0"
107-
};
108-
ValidatePSResourceGroupDeploymentParameters actualParameters = new ValidatePSResourceGroupDeploymentParameters();
109-
List<PSResourceManagerError> expected = new List<PSResourceManagerError>()
110-
{
111-
new PSResourceManagerError()
112-
{
113-
Code = "202",
114-
Message = "bad input",
115-
},
116-
new PSResourceManagerError()
117-
{
118-
Code = "203",
119-
Message = "bad input 2",
120-
},
121-
new PSResourceManagerError()
122-
{
123-
Code = "203",
124-
Message = "bad input 3",
125-
}
126-
};
127-
resourcesClientMock.Setup(f => f.ValidatePSResourceGroupDeployment(
128-
It.IsAny<ValidatePSResourceGroupDeploymentParameters>(), DeploymentMode.Incremental))
129-
.Returns(expected)
130-
.Callback((ValidatePSResourceGroupDeploymentParameters p, DeploymentMode m) => { actualParameters = p; m = DeploymentMode.Incremental; });
131-
132-
cmdlet.ResourceGroupName = resourceGroupName;
133-
cmdlet.GalleryTemplateIdentity = expectedParameters.GalleryTemplateIdentity;
134-
cmdlet.TemplateVersion = expectedParameters.TemplateVersion;
13582

13683
cmdlet.ExecuteCmdlet();
13784

138-
Assert.Equal(expectedParameters.GalleryTemplateIdentity, actualParameters.GalleryTemplateIdentity);
13985
Assert.Equal(expectedParameters.TemplateFile, actualParameters.TemplateFile);
14086
Assert.NotNull(actualParameters.TemplateParameterObject);
141-
Assert.Equal(expectedParameters.TemplateVersion, actualParameters.TemplateVersion);
142-
Assert.Equal(null, actualParameters.StorageAccountName);
14387

14488
commandRuntimeMock.Verify(f => f.WriteObject(expected), Times.Once());
14589
}

‎src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroups/NewAzureResourceGroupCommandTests.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,42 @@ public NewAzureResourceGroupCommandTests()
6262
}
6363
};
6464
}
65+
66+
[Fact]
67+
[Trait(Category.AcceptanceType, Category.CheckIn)]
68+
public void CreatesNewPSResourceGroup()
69+
{
70+
CreatePSResourceGroupParameters expectedParameters = new CreatePSResourceGroupParameters()
71+
{
72+
ResourceGroupName = resourceGroupName,
73+
Location = resourceGroupLocation,
74+
TemplateFile = templateFile,
75+
DeploymentName = deploymentName,
76+
Tag = tags
77+
};
78+
CreatePSResourceGroupParameters actualParameters = new CreatePSResourceGroupParameters();
79+
PSResourceGroup expected = new PSResourceGroup()
80+
{
81+
Location = expectedParameters.Location,
82+
ResourceGroupName = expectedParameters.ResourceGroupName,
83+
Resources = new List<PSResource>() { new PSResource() { Name = "resource1" } },
84+
Tags = expectedParameters.Tag
85+
};
86+
resourcesClientMock.Setup(f => f.CreatePSResourceGroup(It.IsAny<CreatePSResourceGroupParameters>()))
87+
.Returns(expected)
88+
.Callback((CreatePSResourceGroupParameters p) => { actualParameters = p; });
89+
90+
cmdlet.Name = expectedParameters.ResourceGroupName;
91+
cmdlet.Location = expectedParameters.Location;
92+
cmdlet.Tag = expectedParameters.Tag;
93+
94+
cmdlet.ExecuteCmdlet();
95+
96+
Assert.Equal(expectedParameters.ResourceGroupName, actualParameters.ResourceGroupName);
97+
Assert.Equal(expectedParameters.Location, actualParameters.Location);
98+
Assert.Equal(expectedParameters.Tag, actualParameters.Tag);
99+
100+
commandRuntimeMock.Verify(f => f.WriteObject(expected), Times.Once());
101+
}
65102
}
66103
}

‎src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
<Compile Include="RoleDefinitions\NewAzureRoleDefinitionCommand.cs" />
210210
<Compile Include="RoleDefinitions\SetAzureRoleDefinitionCommand.cs" />
211211
<Compile Include="RoleDefinitions\RemoveAzureRoleDefinitionCommand.cs" />
212-
<Compile Include="Templates\TestAzureResourceGroupTemplateCommand.cs" />
212+
<Compile Include="ResourceGroupDeployments\TestAzureResourceGroupDeploymentCommand.cs" />
213213
<Compile Include="Models.ResourceGroups\CreatePSResourceParameters.cs" />
214214
<Compile Include="Models.ResourceGroups\PSResource.cs" />
215215
<Compile Include="Models.ResourceGroups\DeploymentVariable.cs" />

0 commit comments

Comments
 (0)