change placeholder protocol to 443

Author: akshaysngupta

functional_tests/empty_cluster_with_private_ip.json

@@ -16,11 +16,11 @@
                 "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
                 }
             }
@@ -71,16 +71,16 @@
         ],
         "probes": [
             {
-                "id": "/subscriptions/--subscription--/resourceGroups/--resource-group--/providers/Microsoft.Network/applicationGateways/--app-gw-name--/probes/defaultprobe-Http",
-                "name": "defaultprobe-Http",
+                "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": "Http",
+                    "protocol": "Https",
                     "timeout": 30,
                     "unhealthyThreshold": 3
                 }

pkg/appgw/backendhttpsettings.go

@@ -73,7 +73,7 @@ func (c *appGwConfigBuilder) getBackendsAndSettingsMap(cbCtx *ConfigBuilderConte
 		return *c.mem.settings, *c.mem.settingsByBackend, *c.mem.serviceBackendPairsByBackend, nil
 	}
 
-	defaultHTTPSetting := defaultBackendHTTPSettings(c.appGwIdentifier, n.ApplicationGatewayProtocolHTTP)
+	defaultHTTPSetting := defaultBackendHTTPSettings(c.appGwIdentifier)
 	serviceBackendPairMap := make(map[backendIdentifier]serviceBackendPortPair)
 	backendHTTPSettingsMap := make(map[backendIdentifier]*n.ApplicationGatewayBackendHTTPSettings)
 	httpSettingsCollection := make(map[string]n.ApplicationGatewayBackendHTTPSettings)

pkg/appgw/internaltypes.go

@@ -177,16 +177,17 @@ func defaultProbeName(protocol n.ApplicationGatewayProtocol) string {
 	return fmt.Sprintf("%sdefaultprobe-%s", agPrefix, protocol)
 }
 
-func defaultBackendHTTPSettings(appGWIdentifier Identifier, protocol n.ApplicationGatewayProtocol) n.ApplicationGatewayBackendHTTPSettings {
+func defaultBackendHTTPSettings(appGWIdentifier Identifier) n.ApplicationGatewayBackendHTTPSettings {
 	defHTTPSettingsName := DefaultBackendHTTPSettingsName
-	defHTTPSettingsPort := int32(80)
+	defHTTPSettingsPort := int32(443)
+	defHTTPSettingsProtocol := n.ApplicationGatewayProtocolHTTPS
 	return n.ApplicationGatewayBackendHTTPSettings{
 		Name: &defHTTPSettingsName,
 		ID:   to.StringPtr(appGWIdentifier.HTTPSettingsID(defHTTPSettingsName)),
 		ApplicationGatewayBackendHTTPSettingsPropertiesFormat: &n.ApplicationGatewayBackendHTTPSettingsPropertiesFormat{
-			Protocol: protocol,
+			Protocol: defHTTPSettingsProtocol,
 			Port:     &defHTTPSettingsPort,
-			Probe:    resourceRef(appGWIdentifier.probeID(defaultProbeName(protocol))),
+			Probe:    resourceRef(appGWIdentifier.probeID(defaultProbeName(defHTTPSettingsProtocol))),
 
 			// setting to default
 			PickHostNameFromBackendAddress: to.BoolPtr(false),