Skip to content
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.

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

Add support for Network Security Groups #225

Merged
merged 28 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
38d3fc0
Initial proto files for adding NSG support
mjethwa-msft Feb 21, 2023
9a7ba2a
Update formatting
mjethwa-msft Feb 21, 2023
25a4254
Update NSG proto
mjethwa-msft Mar 1, 2023
2bd5ade
Changes for protobuf compilation
mjethwa-msft Mar 7, 2023
badb0af
Add ICMP to network proto
mjethwa-msft Mar 16, 2023
098914f
Add NSG Provider Type to common proto
mjethwa-msft Mar 21, 2023
3ff5d92
Add ICMPv6 and compiled protobufs
mjethwa-msft Mar 30, 2023
a9e39b5
halfway through a merge - need to regenerate proto files
Sep 20, 2023
0827ff4
fix setup and add merged and updated pb.go files
Sep 20, 2023
93903f1
Merge branch 'main' of github.com:microsoft/moc into user/vlappenbusc…
Oct 3, 2023
54cef95
Merge branch 'main' of github.com:microsoft/moc into user/vlappenbusc…
Oct 11, 2023
254a6f5
push for testing
Oct 25, 2023
c236c7c
update nsg change start
Dec 11, 2023
7da388e
current changes, make all is failing
Dec 11, 2023
1f207bc
fix failing test
Dec 11, 2023
7f85406
functional, start pr process
Dec 19, 2023
6fe88ff
resolve conflicts
Dec 19, 2023
8b1bbeb
revert test, seems to be passing now
Dec 19, 2023
fe14d6e
remove comment
Jan 12, 2024
685bf78
merge with master
Jan 30, 2024
5b1439d
Merge branch 'main' into user/vlappenbusch/nsg
vlappenbusch Jan 30, 2024
c0ff7c5
Merge branch 'main' of github.com:microsoft/moc into user/vlappenbusc…
Feb 13, 2024
e3894ee
Merge branch 'user/vlappenbusch/nsg' of github.com:microsoft/moc into…
Feb 13, 2024
4e84f07
remove plural options in nsg rule
Feb 16, 2024
a8d4e1c
remove location from NSG
Feb 16, 2024
4428f3f
Revert "remove location from NSG"
Feb 16, 2024
580e6f9
track if nsg rule is default
Feb 21, 2024
cbb0459
update with master
Mar 5, 2024
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
4 changes: 4 additions & 0 deletions common/roles.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ const (
LBContributorRoleName = "LBContributor"
// Network Interface Contributor Role - has permissions to run any operation on network interfaces
NIContributorRoleName = "NetworkInterfaceContributor"
// Network Security Group Contributor Role - has permissions to run any operation on network security groups
NSGContributorRoleName = "NetworkSecurityGroupContributor"
// VM Contributor Role - has permissions to run any operation on VMs
VMContributorRoleName = "VMContributor"
// VM Updater Role - has permissions to update VMs
Expand Down Expand Up @@ -89,6 +91,8 @@ const (
LBReaderRoleName = "LBReader"
// Network Interface Reader Role - has permissions to run read operations on network interfaces
NIReaderRoleName = "NetworkInterfaceReader"
// Network Security Group Reader Role - has permissions to run read operations on network security groups
NSGReaderRoleName = "NetworkSecurityGroupReader"
// VM Reader Role - has permissions to run read operations on VMs
VMReaderRoleName = "VMReader"
// VirtualMachineImage Reader Role - has permissions to run read operations on VirtualMachineImages
Expand Down
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ require (
gopkg.in/yaml.v3 v3.0.1
)

require google.golang.org/protobuf v1.32.0 // indirect
require (
golang.org/x/net v0.21.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
)

replace (
github.com/golang/mock => github.com/golang/mock v1.6.0
Expand Down
4 changes: 3 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1111,8 +1111,9 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -1172,6 +1173,7 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
Expand Down
1 change: 1 addition & 0 deletions pkg/validations/proxy_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func Test_TestProxyUrlConnection(t *testing.T) {
// Invalid hostname
err = TestProxyUrlConnection(parsedUrl, caCertString, "")
expectedResult := "Get \"https://mcr.microsoft.com\": proxyconnect tcp: dial tcp: lookup w3proxy.netscape.com: no such host: Invalid Input"

if err.Error() != expectedResult {
t.Fatalf("Test_TestProxyUrlConnection test case failed. Expected error %s but got %s", expectedResult, err.Error())
}
Expand Down
113 changes: 61 additions & 52 deletions rpc/cloudagent/network/moc_cloudagent_networkinterface.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading