From 9c3ee4f2556ef44e4c492b676a3ca7a13737e17b Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Thu, 8 Feb 2018 11:23:52 -0800 Subject: [PATCH] Fixing License Headers to match CI Regex An extra special character was breaking CI. I removed it to squelch the message. Also, renaming the profile `definition.go` files to `generate.go` files as per review feedback. --- profiles/2017-03-09/definition.go | 3 --- profiles/2017-03-09/generate.go | 17 +++++++++++++++++ profiles/latest/definition.go | 3 --- profiles/latest/generate.go | 17 +++++++++++++++++ profiles/preview/definition.go | 3 --- profiles/preview/generate.go | 17 +++++++++++++++++ tools/profileBuilder/cmd/latest.go | 2 +- tools/profileBuilder/cmd/list.go | 2 +- tools/profileBuilder/cmd/root.go | 2 +- tools/profileBuilder/main.go | 2 +- 10 files changed, 55 insertions(+), 13 deletions(-) delete mode 100644 profiles/2017-03-09/definition.go create mode 100644 profiles/2017-03-09/generate.go delete mode 100644 profiles/latest/definition.go create mode 100644 profiles/latest/generate.go delete mode 100644 profiles/preview/definition.go create mode 100644 profiles/preview/generate.go diff --git a/profiles/2017-03-09/definition.go b/profiles/2017-03-09/definition.go deleted file mode 100644 index ba755af80fa3..000000000000 --- a/profiles/2017-03-09/definition.go +++ /dev/null @@ -1,3 +0,0 @@ -package v20170309 - -//go:generate cat ./definition.txt | go run ../../tools/profileBuilder/main.go list --name 2017-03-09 diff --git a/profiles/2017-03-09/generate.go b/profiles/2017-03-09/generate.go new file mode 100644 index 000000000000..f96e9806d7f2 --- /dev/null +++ b/profiles/2017-03-09/generate.go @@ -0,0 +1,17 @@ +// Copyright 2018 Microsoft Corporation +// +// 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 v20170309 + +//go:generate cat ./definition.txt | go run ../../tools/profileBuilder/main.go list --name 2017-03-09 diff --git a/profiles/latest/definition.go b/profiles/latest/definition.go deleted file mode 100644 index 7cfb5526839d..000000000000 --- a/profiles/latest/definition.go +++ /dev/null @@ -1,3 +0,0 @@ -package latest - -//go:generate go run ../../tools/profileBuilder/main.go latest --name latest diff --git a/profiles/latest/generate.go b/profiles/latest/generate.go new file mode 100644 index 000000000000..22f3f6476993 --- /dev/null +++ b/profiles/latest/generate.go @@ -0,0 +1,17 @@ +// Copyright 2018 Microsoft Corporation +// +// 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 latest + +//go:generate go run ../../tools/profileBuilder/main.go latest --name latest diff --git a/profiles/preview/definition.go b/profiles/preview/definition.go deleted file mode 100644 index b1e7fb4c85ea..000000000000 --- a/profiles/preview/definition.go +++ /dev/null @@ -1,3 +0,0 @@ -package preview - -//go:generate go run ../../tools/profileBuilder/main.go latest --name preview --preview diff --git a/profiles/preview/generate.go b/profiles/preview/generate.go new file mode 100644 index 000000000000..4dd7ca6c33ff --- /dev/null +++ b/profiles/preview/generate.go @@ -0,0 +1,17 @@ +// Copyright 2018 Microsoft Corporation +// +// 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 preview + +//go:generate go run ../../tools/profileBuilder/main.go latest --name preview --preview diff --git a/tools/profileBuilder/cmd/latest.go b/tools/profileBuilder/cmd/latest.go index ecb523daf41a..ecb87247dc51 100644 --- a/tools/profileBuilder/cmd/latest.go +++ b/tools/profileBuilder/cmd/latest.go @@ -1,6 +1,6 @@ // +build go1.9 -// Copyright © 2018 Microsoft Corporation +// Copyright 2018 Microsoft Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/tools/profileBuilder/cmd/list.go b/tools/profileBuilder/cmd/list.go index a0d4e6ba90de..8d11a40a1378 100644 --- a/tools/profileBuilder/cmd/list.go +++ b/tools/profileBuilder/cmd/list.go @@ -1,6 +1,6 @@ // +build go1.9 -// Copyright © 2018 Microsoft Corporation +// Copyright 2018 Microsoft Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/tools/profileBuilder/cmd/root.go b/tools/profileBuilder/cmd/root.go index d78f2605226e..b7f789077611 100644 --- a/tools/profileBuilder/cmd/root.go +++ b/tools/profileBuilder/cmd/root.go @@ -1,6 +1,6 @@ // +build go1.9 -// Copyright © 2018 Microsoft Corporation +// Copyright 2018 Microsoft Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/tools/profileBuilder/main.go b/tools/profileBuilder/main.go index 5e65425ff3de..f427d644b13b 100644 --- a/tools/profileBuilder/main.go +++ b/tools/profileBuilder/main.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Microsoft Corporation +// Copyright 2018 Microsoft Corporation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.