From 140ac46e678d5abb3546ea2ef646825cb69158cf Mon Sep 17 00:00:00 2001
From: Yousong Zhou <zhouyousong@yunionyun.com>
Date: Sun, 22 Mar 2020 18:02:01 +0800
Subject: [PATCH] cloudevent: use cloudprovider proxysetting

---
 pkg/cloudevent/models/cloudproviders.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkg/cloudevent/models/cloudproviders.go b/pkg/cloudevent/models/cloudproviders.go
index 34817f340e..08a4116136 100644
--- a/pkg/cloudevent/models/cloudproviders.go
+++ b/pkg/cloudevent/models/cloudproviders.go
@@ -16,8 +16,12 @@ package models
 
 import (
 	"context"
+	"net/http"
+	"net/url"
 	"time"
 
+	"golang.org/x/net/http/httpproxy"
+
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
@@ -25,6 +29,7 @@ import (
 	"yunion.io/x/pkg/util/timeutils"
 	"yunion.io/x/pkg/utils"
 
+	proxyapi "yunion.io/x/onecloud/pkg/apis/cloudcommon/proxy"
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
@@ -68,6 +73,8 @@ type SCloudprovider struct {
 
 	Provider string `width:"64" charset:"ascii" list:"domain"`
 	Brand    string `width:"64" charset:"ascii" list:"domain"`
+
+	ProxySetting *proxyapi.SProxySetting
 }
 
 func (manager *SCloudproviderManager) GetRegionCloudproviders(ctx context.Context, userCred mcclient.TokenCredential) ([]SCloudprovider, error) {
@@ -299,6 +306,17 @@ func (provider *SCloudprovider) GetProvider() (cloudprovider.ICloudProvider, err
 	if err != nil {
 		return nil, err
 	}
+
+	ps := provider.ProxySetting
+	cfg := &httpproxy.Config{
+		HTTPProxy:  ps.HTTPProxy,
+		HTTPSProxy: ps.HTTPSProxy,
+		NoProxy:    ps.NoProxy,
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
 	return cloudprovider.GetProvider(
 		cloudprovider.ProviderConfig{
 			Id:      provider.Id,
@@ -307,6 +325,8 @@ func (provider *SCloudprovider) GetProvider() (cloudprovider.ICloudProvider, err
 			URL:     accessUrl,
 			Account: provider.Account,
 			Secret:  passwd,
+
+			ProxyFunc: proxyFunc,
 		},
 	)
 }