gofmt code

shimmeris · Jan 9, 2023 · 414c514 · 414c514
1 parent e7dcc4d
commit 414c514
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/cmd/socks.go b/cmd/socks.go
@@ -57,7 +57,7 @@ func invoke(providerConfigPath, message string) {
 	}
 
 	for provider, rmap := range conf.Records {
-		for region, _ := range rmap {
+		for region := range rmap {
 			go func(provider, region string) {
 				p, err := createProvider(provider, region, providerConfig)
 				if err != nil {
@@ -71,7 +71,7 @@ func invoke(providerConfigPath, message string) {
 				}
 
 				opts := &sdk.FunctionOpts{
-					Namespace: Namespace,
+					Namespace:    Namespace,
 					FunctionName: SocksFunctionName,
 				}
 				err = sp.InvokeFunction(opts, message)
@@ -110,6 +110,7 @@ func (m *Message) Json() string {
 }
 
 var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+
 func randomString(n int) string {
 	b := make([]rune, n)
 	for i := range b {

diff --git a/sdk/options.go b/sdk/options.go
@@ -1,7 +1,7 @@
 package sdk
 
 type FunctionOpts struct {
-	Namespace string
+	Namespace    string
 	FunctionName string
 	TriggerName  string
 	OnlyTrigger  bool

diff --git a/sdk/provider/alibaba/provider.go b/sdk/provider/alibaba/provider.go
@@ -44,7 +44,6 @@ func (p *Provider) Region() string {
 	return p.region
 }
 
-
 func Regions() []string {
 	return []string{
 		"ap-northeast-1",

diff --git a/sdk/provider/alibaba/socks.go b/sdk/provider/alibaba/socks.go
@@ -41,11 +41,10 @@ func (p *Provider) createSocksFunction(serviceName, functionName string) error {
 	return nil
 }
 
-
 func (p *Provider) InvokeFunction(opts *sdk.FunctionOpts, message string) error {
 	h := &fcopen.InvokeFunctionHeaders{XFcInvocationType: tea.String("Async")}
 	r := &fcopen.InvokeFunctionRequest{Body: []byte(message)}
 
 	_, err := p.fclient.InvokeFunctionWithOptions(tea.String(opts.Namespace), tea.String(opts.FunctionName), r, h, p.runtime)
 	return err
-}
+}
diff --git a/sdk/provider/huawei/http.go b/sdk/provider/huawei/http.go
@@ -14,22 +14,22 @@ import (
 
 const GroupName = "scf"
 
-func (p *Provider) DeployHttpProxy(opts *sdk.HttpProxyOpts) (*sdk.DeployHttpProxyResult, error) {
+func (p *Provider) DeployHttpProxy(opts *sdk.FunctionOpts) (string, error) {
 	if err := p.createGroup(GroupName); err != nil {
-		return nil, err
+		return "", err
 	}
 
 	functionUrn, err := p.createFunction(opts.FunctionName)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	triggerId, err := p.createHttpTrigger(functionUrn, opts.TriggerName)
+	api, err := p.createHttpTrigger(functionUrn, opts.TriggerName)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	return &sdk.DeployHttpProxyResult{API: triggerId, Region: p.region, Provider: p.Name()}, nil
+	return api, nil
 
 }
 

diff --git a/sdk/provider/tencent/provider.go b/sdk/provider/tencent/provider.go
@@ -46,7 +46,6 @@ func (p *Provider) Region() string {
 	return p.region
 }
 
-
 func Regions() []string {
 	// 腾讯云大陆外地区部署延迟巨大，暂不进行部署
 	return []string{

diff --git a/sdk/provider/tencent/socks.go b/sdk/provider/tencent/socks.go
@@ -18,7 +18,7 @@ func (p *Provider) DeploySocksProxy(opts *sdk.FunctionOpts) error {
 }
 
 func (p *Provider) ClearSocksProxy(opts *sdk.FunctionOpts) error {
-	return p.deleteFunction(opts.Namespace, opts.FunctionName);
+	return p.deleteFunction(opts.Namespace, opts.FunctionName)
 }
 
 func (p *Provider) createSocksFunction(namespace, functionName string) error {
@@ -50,4 +50,4 @@ func (p *Provider) InvokeFunction(opts *sdk.FunctionOpts, message string) error
 	_, err := p.fclient.Invoke(r)
 	return err
 
-}
+}