fix tests

Azure · Apr 23, 2024 · 8c97e20 · 8c97e20
1 parent 88923e3
commit 8c97e20
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/pkg/appgw/backendhttpsettings_test.go b/pkg/appgw/backendhttpsettings_test.go
@@ -72,8 +72,8 @@ var _ = Describe("Test the creation of Backend http settings from Ingress defini
 
 			for _, setting := range httpSettings {
 				if *setting.Name == DefaultBackendHTTPSettingsName {
-					Expect(setting.Protocol).To(Equal(n.ApplicationGatewayProtocolHTTP), "default backend %s should have %s", *setting.Name, n.ApplicationGatewayProtocolHTTP)
-					Expect(probes[utils.GetLastChunkOfSlashed(*setting.Probe.ID)].Protocol).To(Equal(n.ApplicationGatewayProtocolHTTP), "default probe should have http")
+					Expect(setting.Protocol).To(Equal(n.ApplicationGatewayProtocolHTTPS), "default backend %s should have %s", *setting.Name, n.ApplicationGatewayProtocolHTTPS)
+					Expect(probes[utils.GetLastChunkOfSlashed(*setting.Probe.ID)].Protocol).To(Equal(n.ApplicationGatewayProtocolHTTPS), "default probe should have http")
 					continue
 				}
 
@@ -114,8 +114,8 @@ var _ = Describe("Test the creation of Backend http settings from Ingress defini
 
 			for _, setting := range httpSettings {
 				if *setting.Name == DefaultBackendHTTPSettingsName {
-					Expect(setting.Protocol).To(Equal(n.ApplicationGatewayProtocolHTTP), "default backend %s should have %s", *setting.Name, n.ApplicationGatewayProtocolHTTP)
-					Expect(probes[utils.GetLastChunkOfSlashed(*setting.Probe.ID)].Protocol).To(Equal(n.ApplicationGatewayProtocolHTTP), "default probe should have http")
+					Expect(setting.Protocol).To(Equal(n.ApplicationGatewayProtocolHTTPS), "default backend %s should have %s", *setting.Name, n.ApplicationGatewayProtocolHTTP)
+					Expect(probes[utils.GetLastChunkOfSlashed(*setting.Probe.ID)].Protocol).To(Equal(n.ApplicationGatewayProtocolHTTPS), "default probe should have http")
 					continue
 				}
 
@@ -154,7 +154,7 @@ var _ = Describe("Test the creation of Backend http settings from Ingress defini
 
 			for _, setting := range httpSettings {
 				if *setting.Name == DefaultBackendHTTPSettingsName {
-					Expect(int32(80)).To(Equal(*setting.Port), "default backend port %d should be 80", *setting.Port)
+					Expect(int32(443)).To(Equal(*setting.Port), "default backend port %d should be 80", *setting.Port)
 				} else if strings.Contains(*setting.Name, strconv.Itoa(int(tests.ContainerPort))) {
 					// http setting for ingress with service port as 80
 					Expect(tests.ContainerPort).To(Equal(*setting.Port), "setting %s backend port %d should be 9876", *setting.Name, *setting.Port)
@@ -189,7 +189,7 @@ var _ = Describe("Test the creation of Backend http settings from Ingress defini
 
 			for _, setting := range httpSettings {
 				if *setting.Name == DefaultBackendHTTPSettingsName {
-					Expect(int32(80)).To(Equal(*setting.Port), "default backend port %d should be 80", *setting.Port)
+					Expect(int32(443)).To(Equal(*setting.Port), "default backend port %d should be 80", *setting.Port)
 				} else if strings.Contains(*setting.Name, strconv.Itoa(int(tests.ContainerPort))) {
 					// http setting for ingress with service port as 80
 					Expect(tests.ContainerPort).To(Equal(*setting.Port), "setting %s backend port %d should be 9876", *setting.Name, *setting.Port)
@@ -238,7 +238,7 @@ var _ = Describe("Test the creation of Backend http settings from Ingress defini
 
 			for _, setting := range httpSettings {
 				if *setting.Name == DefaultBackendHTTPSettingsName {
-					Expect(int32(80)).To(Equal(*setting.Port), "default backend port %d should be 80", *setting.Port)
+					Expect(int32(443)).To(Equal(*setting.Port), "default backend port %d should be 80", *setting.Port)
 				} else if strings.Contains(*setting.Name, strconv.Itoa(int(tests.ContainerPort))) {
 					// http setting for ingress with service port as 80
 					Expect(tests.ContainerPort).To(Equal(*setting.Port), "setting %s backend port %d should be 9876", *setting.Name, *setting.Port)

diff --git a/pkg/appgw/configbuilder_test.go b/pkg/appgw/configbuilder_test.go
@@ -489,11 +489,11 @@ var _ = Describe("Tests `appgw.ConfigBuilder`", func() {
 --                "properties": {
 --                    "cookieBasedAffinity": "Disabled",
 --                    "pickHostNameFromBackendAddress": false,
---                    "port": 80,
+--                    "port": 443,
 --                    "probe": {
---                        "id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http"
+--                        "id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https"
 --                    },
---                    "protocol": "Http",
+--                    "protocol": "Https",
 --                    "requestTimeout": 30
 --                }
 --            }
@@ -557,6 +557,21 @@ var _ = Describe("Tests `appgw.ConfigBuilder`", func() {
 --                    "timeout": 30,
 --                    "unhealthyThreshold": 3
 --                }
+--            },
+--            {
+--                "id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Https",
+--                "name": "defaultprobe-Https",
+--                "properties": {
+--                    "host": "localhost",
+--                    "interval": 30,
+--                    "match": {},
+--                    "minServers": 0,
+--                    "path": "/",
+--                    "pickHostNameFromBackendHttpSettings": false,
+--                    "protocol": "Https",
+--                    "timeout": 30,
+--                    "unhealthyThreshold": 3
+--                }
 --            }
 --        ],
 --        "redirectConfigurations": [],