From eeec417ebedd26aba1a216cdd29e903557b6fe99 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 13 Aug 2018 20:02:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9Acloudprovider?= =?UTF-8?q?=E7=9A=84secret=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E5=9C=A8lis?= =?UTF-8?q?t=E4=B8=AD=E8=8E=B7=E5=BE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/cloudproviders.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 4b24aabaa0..c659160fc4 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -47,8 +47,8 @@ type SCloudprovider struct { AccessUrl string `width:"64" charset:"ascii" nullable:"true" list:"admin" update:"admin" create:"admin_optional"` // Hostname string `width:"64" charset:"ascii" nullable:"true"` // Column(VARCHAR(64, charset='ascii'), nullable=False) // port = Column(Integer, nullable=False) - Account string `width:"64" charset:"ascii" nullable:"false" list:"admin" create:"admin_required"` // Column(VARCHAR(64, charset='ascii'), nullable=False) - Secret string `width:"256" charset:"ascii" nullable:"false" create:"admin_required"` // Column(VARCHAR(256, charset='ascii'), nullable=False) + Account string `width:"64" charset:"ascii" nullable:"false" list:"admin" create:"admin_required"` // Column(VARCHAR(64, charset='ascii'), nullable=False) + Secret string `width:"256" charset:"ascii" nullable:"false" list:"admin" create:"admin_required"` // Column(VARCHAR(256, charset='ascii'), nullable=False) LastSync time.Time `get:"admin" list:"admin"` // = Column(DateTime, nullable=True) @@ -257,7 +257,7 @@ func (self *SCloudprovider) AllowPerformSync(ctx context.Context, userCred mccli } func (self *SCloudprovider) PerformSync(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) { - if ! self.Enabled { + if !self.Enabled { return nil, httperrors.NewInvalidStatusError("Cloudprovider disabled") } syncRange := SSyncRange{} @@ -276,7 +276,7 @@ func (self *SCloudprovider) AllowPerformUpdateCredential(ctx context.Context, us } func (self *SCloudprovider) PerformUpdateCredential(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) { - if ! self.Enabled { + if !self.Enabled { return nil, httperrors.NewInvalidStatusError("Cloudprovider disabled") } From 575ec7a9b5dc420cf10d3ff5e63d90d67e470a37 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Tue, 14 Aug 2018 10:30:03 +0800 Subject: [PATCH 2/2] fixup cronman/doc.go --- pkg/cloudcommon/cronman/doc.go | 1 + 1 file changed, 1 insertion(+) create mode 100644 pkg/cloudcommon/cronman/doc.go diff --git a/pkg/cloudcommon/cronman/doc.go b/pkg/cloudcommon/cronman/doc.go new file mode 100644 index 0000000000..96b1f48558 --- /dev/null +++ b/pkg/cloudcommon/cronman/doc.go @@ -0,0 +1 @@ +package cronman // import "yunion.io/x/onecloud/pkg/cloudcommon/cronman"