diff --git a/cmd/s3cli/main.go b/cmd/s3cli/main.go index 935c4716c5..474740df64 100644 --- a/cmd/s3cli/main.go +++ b/cmd/s3cli/main.go @@ -25,8 +25,8 @@ import ( "yunion.io/x/onecloud/pkg/multicloud/objectstore" "yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph" _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/shell" - "yunion.io/x/onecloud/pkg/util/shellutils" "yunion.io/x/onecloud/pkg/multicloud/objectstore/xsky" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/pkg/baremetal/manager_test.go b/pkg/baremetal/manager_test.go index 5b1360885a..c77a105404 100644 --- a/pkg/baremetal/manager_test.go +++ b/pkg/baremetal/manager_test.go @@ -1,3 +1,17 @@ +// 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 baremetal import ( diff --git a/pkg/compute/tasks/guest_delete_backup_task.go b/pkg/compute/tasks/guest_delete_backup_task.go index 38699358ec..5c574c24a5 100644 --- a/pkg/compute/tasks/guest_delete_backup_task.go +++ b/pkg/compute/tasks/guest_delete_backup_task.go @@ -1,3 +1,17 @@ +// 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 tasks import ( diff --git a/pkg/keystone/driver/cas/doc.go b/pkg/keystone/driver/cas/doc.go index 719f52f5b2..a501c00df8 100644 --- a/pkg/keystone/driver/cas/doc.go +++ b/pkg/keystone/driver/cas/doc.go @@ -1 +1,15 @@ +// 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 cas // import "yunion.io/x/onecloud/pkg/keystone/driver/cas" diff --git a/pkg/mcclient/modulebase/doc.go b/pkg/mcclient/modulebase/doc.go index 7f110dd18e..2ce74ff3b7 100644 --- a/pkg/mcclient/modulebase/doc.go +++ b/pkg/mcclient/modulebase/doc.go @@ -1 +1,15 @@ +// 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 modulebase // import "yunion.io/x/onecloud/pkg/mcclient/modulebase" diff --git a/pkg/mcclient/modulebase/utils.go b/pkg/mcclient/modulebase/utils.go index fd0c447b5b..a02afce48a 100644 --- a/pkg/mcclient/modulebase/utils.go +++ b/pkg/mcclient/modulebase/utils.go @@ -1,3 +1,17 @@ +// 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 modulebase import ( diff --git a/pkg/multicloud/loader/doc.go b/pkg/multicloud/loader/doc.go index 94832e0bbf..05b678d2df 100644 --- a/pkg/multicloud/loader/doc.go +++ b/pkg/multicloud/loader/doc.go @@ -1 +1,15 @@ +// 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 loader // import "yunion.io/x/onecloud/pkg/multicloud/loader" diff --git a/pkg/multicloud/loader/loader.go b/pkg/multicloud/loader/loader.go index 70438dea45..1226e65ff7 100644 --- a/pkg/multicloud/loader/loader.go +++ b/pkg/multicloud/loader/loader.go @@ -34,8 +34,8 @@ import ( // object storages _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph/provider" - _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/xsky/provider" _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/xsky/provider" ) func init() { diff --git a/pkg/multicloud/objectstore/ceph/doc.go b/pkg/multicloud/objectstore/ceph/doc.go index b78bf2eaab..330f4c76e0 100644 --- a/pkg/multicloud/objectstore/ceph/doc.go +++ b/pkg/multicloud/objectstore/ceph/doc.go @@ -1 +1,15 @@ +// 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 ceph // import "yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph" diff --git a/pkg/multicloud/objectstore/ceph/provider/doc.go b/pkg/multicloud/objectstore/ceph/provider/doc.go index 05d330d80e..fbb350f37d 100644 --- a/pkg/multicloud/objectstore/ceph/provider/doc.go +++ b/pkg/multicloud/objectstore/ceph/provider/doc.go @@ -1 +1,15 @@ +// 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 provider // import "yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph/provider" diff --git a/pkg/multicloud/objectstore/xsky/adminapi.go b/pkg/multicloud/objectstore/xsky/adminapi.go index 8c85991052..3f1b8725cb 100644 --- a/pkg/multicloud/objectstore/xsky/adminapi.go +++ b/pkg/multicloud/objectstore/xsky/adminapi.go @@ -18,18 +18,18 @@ import ( "context" "fmt" "io" + "math/rand" "net/http" "strings" "time" - "math/rand" "yunion.io/x/jsonutils" - "yunion.io/x/pkg/errors" "yunion.io/x/log" + "yunion.io/x/pkg/errors" - "yunion.io/x/onecloud/pkg/util/httputils" - "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/util/httputils" ) type SXskyAdminApi struct { @@ -90,7 +90,7 @@ type sLoginResponse struct { Create time.Time Expires time.Time Roles []string - User struct { + User struct { Create time.Time Name string Email string @@ -213,7 +213,7 @@ type sKey struct { Status string Type string Update time.Time - User struct { + User struct { Id int Name string } @@ -290,7 +290,7 @@ type sBucket struct { AuthUserPermission string BucketPolicy string Create time.Time - Flag struct { + Flag struct { Versioned bool VersionsSuspended bool Worm bool @@ -304,7 +304,7 @@ type sBucket struct { OsReplicationZoneNum int // osZone OsZoneUuid string - Owner struct { + Owner struct { Id string Name string } @@ -328,14 +328,14 @@ type sPolicy struct { Compress bool Create time.Time Crypto bool - DataPool struct { + DataPool struct { Id int Name string } Default bool Description string Id int - IdexPool struct { + IndexPool struct { Id int Name string } @@ -418,7 +418,7 @@ type sS3LbGroup struct { type sS3LoadBalancer struct { Create time.Time Description string - Group struct { + Group struct { Id int Name string Status string @@ -435,7 +435,7 @@ type sS3LoadBalancer struct { Name string Port int Roles []string - Samples []struct { + Samples []struct { ActiveAconnects int CpuUtil float64 Create time.Time diff --git a/pkg/multicloud/objectstore/xsky/doc.go b/pkg/multicloud/objectstore/xsky/doc.go new file mode 100644 index 0000000000..71b68d83c7 --- /dev/null +++ b/pkg/multicloud/objectstore/xsky/doc.go @@ -0,0 +1,15 @@ +// 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 xsky // import "yunion.io/x/onecloud/pkg/multicloud/objectstore/xsky" diff --git a/pkg/multicloud/objectstore/xsky/provider/doc.go b/pkg/multicloud/objectstore/xsky/provider/doc.go new file mode 100644 index 0000000000..4daf26a1dd --- /dev/null +++ b/pkg/multicloud/objectstore/xsky/provider/doc.go @@ -0,0 +1,15 @@ +// 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 provider // import "yunion.io/x/onecloud/pkg/multicloud/objectstore/xsky/provider" diff --git a/pkg/s3gateway/handlers/doc.go b/pkg/s3gateway/handlers/doc.go index 90381b7885..dbfc3d0cf7 100644 --- a/pkg/s3gateway/handlers/doc.go +++ b/pkg/s3gateway/handlers/doc.go @@ -1 +1,15 @@ +// 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 handlers // import "yunion.io/x/onecloud/pkg/s3gateway/handlers" diff --git a/pkg/s3gateway/models/doc.go b/pkg/s3gateway/models/doc.go index 34a9313299..ebefc3d149 100644 --- a/pkg/s3gateway/models/doc.go +++ b/pkg/s3gateway/models/doc.go @@ -1 +1,15 @@ +// 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 models // import "yunion.io/x/onecloud/pkg/s3gateway/models" diff --git a/pkg/s3gateway/session/doc.go b/pkg/s3gateway/session/doc.go index d3a0ee0c7b..6d4741ffb4 100644 --- a/pkg/s3gateway/session/doc.go +++ b/pkg/s3gateway/session/doc.go @@ -1 +1,15 @@ +// 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 session // import "yunion.io/x/onecloud/pkg/s3gateway/session" diff --git a/pkg/util/s3auth/doc.go b/pkg/util/s3auth/doc.go index d1c1879eb1..c9766fc2d3 100644 --- a/pkg/util/s3auth/doc.go +++ b/pkg/util/s3auth/doc.go @@ -1 +1,15 @@ +// 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 s3auth // import "yunion.io/x/onecloud/pkg/util/s3auth" diff --git a/pkg/util/validate/doc.go b/pkg/util/validate/doc.go index 7d64ed9535..00ef35b048 100644 --- a/pkg/util/validate/doc.go +++ b/pkg/util/validate/doc.go @@ -1 +1,15 @@ +// 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 validate // import "yunion.io/x/onecloud/pkg/util/validate"