Merge pull request #1378 from ioito/hotfix/qx-ssl-create

fix: ssl create

Author: ioito

pkg/cloudprovider/cloudprovider.go

@@ -310,6 +310,7 @@ type ICloudProvider interface {
 	GetMetrics(opts *MetricListOptions) ([]MetricValues, error)
 
 	GetISSLCertificates() ([]ICloudSSLCertificate, error)
+	CreateISSLCertificate(opts *SSLCertificateCreateOptions) (ICloudSSLCertificate, error)
 
 	GetIAiGateways() ([]IAiGateway, error)
 	GetIAiGatewayById(id string) (IAiGateway, error)
@@ -643,6 +644,10 @@ func (base *SBaseProvider) GetISSLCertificates() ([]ICloudSSLCertificate, error)
 	return nil, errors.Wrapf(ErrNotImplemented, "GetISSLCertificates")
 }
 
+func (base *SBaseProvider) CreateISSLCertificate(opts *SSLCertificateCreateOptions) (ICloudSSLCertificate, error) {
+	return nil, errors.Wrapf(ErrNotImplemented, "CreateISSLCertificate")
+}
+
 func (base *SBaseProvider) GetIAiGateways() ([]IAiGateway, error) {
 	return nil, errors.Wrapf(ErrNotImplemented, "GetIAiGateways")
 }

pkg/cloudprovider/resources.go

@@ -1814,7 +1814,6 @@ type ICloudSSLCertificate interface {
 	GetCommon() string
 	GetCountry() string
 	GetIssuer() string
-	GetExpired() bool
 	GetEndDate() time.Time
 	GetFingerprint() string
 	GetCity() string

pkg/cloudprovider/ssl.go

@@ -0,0 +1,25 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudprovider
+
+const (
+	SSL_ISSUER_LETSENCRYPT = "Let's Encrypt"
+	SSL_ISSUER_ZEROSSL     = "ZeroSSL"
+)
+
+type SSLCertificateCreateOptions struct {
+	Certificate string
+	PrivateKey  string
+}

pkg/multicloud/aliyun/sslcertificate.go

@@ -59,10 +59,6 @@ func (s *SSSLCertificate) GetIssuer() string {
 	return s.Issuer
 }
 
-func (s *SSSLCertificate) GetExpired() bool {
-	return s.Expired
-}
-
 func (s *SSSLCertificate) GetEndDate() time.Time {
 	return s.EndDate
 }

pkg/multicloud/huawei/sslcertificate.go

@@ -9,6 +9,7 @@ import (
 	"net/url"
 	"time"
 
+	"yunion.io/x/cloudmux/pkg/apis"
 	"yunion.io/x/cloudmux/pkg/multicloud"
 	"yunion.io/x/pkg/errors"
 )
@@ -66,10 +67,6 @@ func (s *SSSLCertificate) GetIssuer() string {
 	return s.Brand
 }
 
-func (s *SSSLCertificate) GetExpired() bool {
-	return time.Now().After(s.GetEndDate())
-}
-
 func (s *SSSLCertificate) GetEndDate() time.Time {
 	t, _ := time.Parse("2006-01-02 15:04:05", s.ExpireTime)
 	return t
@@ -111,11 +108,7 @@ func (s *SSSLCertificate) GetGlobalId() string {
 }
 
 func (s *SSSLCertificate) GetStatus() string {
-	if s.GetExpired() {
-		return "expired"
-	} else {
-		return "normal"
-	}
+	return apis.STATUS_AVAILABLE
 }
 
 func (s *SSSLCertificate) GetIsUpload() bool {

pkg/multicloud/qcloud/certificate.go

@@ -220,14 +220,6 @@ func (self *SCertificate) GetIssuer() string {
 	return self.ProductZhName
 }
 
-func (self *SCertificate) GetExpired() bool {
-	if self.Status == 3 {
-		return true
-	} else {
-		return false
-	}
-}
-
 func (self *SCertificate) GetEndDate() time.Time {
 	return self.CERTEndTime
 }