From c445808a45696eb65c83001127d967d412f3cb3c Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Feb 10 2023 21:08:34 +0000 Subject: Retired: Long term failure to build --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c2bae30..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg-1.7.0.tar.gz -/pkg-1.8.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 7e66b54..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# golang-istio-pkg - -The golang-istio-pkg package diff --git a/Sync-with-istio-api.patch b/Sync-with-istio-api.patch deleted file mode 100644 index c97b997..0000000 --- a/Sync-with-istio-api.patch +++ /dev/null @@ -1,237 +0,0 @@ -From 0b407cba2790a3d20b1aaf5f7f58d2a99070190a Mon Sep 17 00:00:00 2001 -From: jacob-delgado -Date: Wed, 13 Jan 2021 07:02:53 -0700 -Subject: [PATCH] Update dependencies (#295) - -* Run go get istio.io/api - -* Attribute references istio/api policy which was deprecated in 1.6 - -* run BUILD_WITH_CONTAINERS=1 make gen ---- - attribute/finder.go | 113 ------------ - attribute/finder_test.go | 95 ---------- - 6 files changed, 0 insertions(+), 208 deletions(-) - delete mode 100644 attribute/finder.go - delete mode 100644 attribute/finder_test.go - -diff --git a/attribute/finder.go b/attribute/finder.go -deleted file mode 100644 -index 0ae2bf8..0000000 ---- a/attribute/finder.go -+++ /dev/null -@@ -1,113 +0,0 @@ --// Copyright 2018 Istio Authors --// --// 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 attribute -- --import ( -- "fmt" -- "sort" -- -- configpb "istio.io/api/policy/v1beta1" -- "istio.io/pkg/pool" --) -- --// AttributeDescriptorFinder finds attribute descriptors. --// nolint: golint --type AttributeDescriptorFinder interface { -- // GetAttribute finds attribute descriptor in the vocabulary. returns nil if not found. -- GetAttribute(name string) *configpb.AttributeManifest_AttributeInfo -- // Attributes exposes the internal attribute manifest -- Attributes() map[string]*configpb.AttributeManifest_AttributeInfo --} -- --// NewFinder returns a new AttributeDescriptorFinder instance, based on the given attributes --func NewFinder(attributes map[string]*configpb.AttributeManifest_AttributeInfo) AttributeDescriptorFinder { -- return finder{ -- attributes: attributes, -- } --} -- --// finder exposes expr.AttributeDescriptorFinder --type finder struct { -- attributes map[string]*configpb.AttributeManifest_AttributeInfo --} -- --var _ AttributeDescriptorFinder = finder{} -- --// GetAttribute finds an attribute by name. returns nil if not found. --func (a finder) GetAttribute(name string) *configpb.AttributeManifest_AttributeInfo { -- return a.attributes[name] --} -- --// Attributes exposes the internal attribute manifest. --func (a finder) Attributes() map[string]*configpb.AttributeManifest_AttributeInfo { -- return a.attributes --} -- --func (a finder) String() string { -- b := pool.GetBuffer() -- -- // Sort by attribute names for stable ordering. -- i := 0 -- names := make([]string, len(a.attributes)) -- for name := range a.attributes { -- names[i] = name -- i++ -- } -- sort.Strings(names) -- -- fmt.Fprintln(b, "Attributes:") -- for _, n := range names { -- fmt.Fprintf(b, " %s: %s", n, a.attributes[n].ValueType.String()) -- fmt.Fprintln(b) -- } -- -- s := b.String() -- pool.PutBuffer(b) -- return s --} -- --// NewChainedFinder returns an attribute finder that delegates to a parent finder with some overrides. --func NewChainedFinder(parent AttributeDescriptorFinder, overrides map[string]*configpb.AttributeManifest_AttributeInfo) AttributeDescriptorFinder { -- return &chainedFinder{ -- parent: parent, -- overrides: overrides, -- } --} -- --type chainedFinder struct { -- parent AttributeDescriptorFinder -- overrides map[string]*configpb.AttributeManifest_AttributeInfo --} -- --var _ AttributeDescriptorFinder = &chainedFinder{} -- --// GetAttribute finds an attribute by name. returns nil if not found. --func (a *chainedFinder) GetAttribute(name string) *configpb.AttributeManifest_AttributeInfo { -- if info, exists := a.overrides[name]; exists { -- return info -- } -- return a.parent.GetAttribute(name) --} -- --func (a *chainedFinder) Attributes() map[string]*configpb.AttributeManifest_AttributeInfo { -- out := make(map[string]*configpb.AttributeManifest_AttributeInfo) -- for name, attr := range a.parent.Attributes() { -- out[name] = attr -- } -- for name, attr := range a.overrides { -- out[name] = attr -- } -- return out --} -diff --git a/attribute/finder_test.go b/attribute/finder_test.go -deleted file mode 100644 -index 533b198..0000000 ---- a/attribute/finder_test.go -+++ /dev/null -@@ -1,95 +0,0 @@ --// Copyright 2018 Istio Authors --// --// 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 attribute -- --import ( -- "fmt" -- "testing" -- -- descriptorpb "istio.io/api/policy/v1beta1" --) -- --func TestFinder(t *testing.T) { -- -- var finder AttributeDescriptorFinder = finder{ -- attributes: map[string]*descriptorpb.AttributeManifest_AttributeInfo{ -- "foo": { -- ValueType: descriptorpb.DOUBLE, -- }, -- "baz": { -- ValueType: descriptorpb.INT64, -- }, -- }, -- } -- -- foo := finder.GetAttribute("foo") -- if foo == nil || foo.ValueType != descriptorpb.DOUBLE { -- t.Fail() -- } -- -- bar := finder.GetAttribute("bar") -- if bar != nil { -- t.Fail() -- } -- -- expected := `Attributes: -- baz: INT64 -- foo: DOUBLE --` -- s := fmt.Sprintf("%v", finder) -- if s != expected { -- t.Log(s) -- t.Log("!=") -- t.Logf(expected) -- t.Fatal("finder.String() mismatch") -- } -- -- num := len(finder.Attributes()) -- if num != 2 { -- t.Errorf("got %d attributes, want 2", num) -- } --} -- --func TestChainedFinder(t *testing.T) { -- finder := NewFinder(map[string]*descriptorpb.AttributeManifest_AttributeInfo{ -- "foo": { -- ValueType: descriptorpb.DOUBLE, -- }, -- "bar": { -- ValueType: descriptorpb.DOUBLE, -- }, -- }) -- -- child := NewChainedFinder(finder, map[string]*descriptorpb.AttributeManifest_AttributeInfo{ -- "bar": { -- ValueType: descriptorpb.INT64, -- }, -- }) -- -- foo := child.GetAttribute("foo") -- if foo == nil || foo.ValueType != descriptorpb.DOUBLE { -- t.Errorf("unexpected attribute info %v", foo) -- } -- -- bar := child.GetAttribute("bar") -- if bar == nil || bar.ValueType != descriptorpb.INT64 { -- t.Errorf("unexpected attribute info %v", bar) -- } -- -- num := len(child.Attributes()) -- if num != 2 { -- t.Errorf("got %d attributes, want 2", num) -- } --} diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..ab7426e --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Retired: Long term failure to build diff --git a/golang-istio-pkg.spec b/golang-istio-pkg.spec deleted file mode 100644 index 8b8e5ae..0000000 --- a/golang-istio-pkg.spec +++ /dev/null @@ -1,113 +0,0 @@ -# Generated by go2rpm 1 -%bcond_without check - -# https://github.com/istio/pkg -%global goipath istio.io/pkg -%global forgeurl https://github.com/istio/pkg -Version: 1.8.2 -%global tag 1.8.2 - -%gometa - -%global common_description %{expand: -Common packages used by other repos.} - -%global golicenses LICENSE -%global godocs CONTRIBUTING.md README.md SUPPORT.md - -Name: %{goname} -Release: 8%{?dist} -Summary: Common packages used by other repos - -# Upstream license specification: Apache-2.0 -License: ASL 2.0 -URL: %{gourl} -Source0: %{gosource} -# From upstream, delete next release -Patch0: Sync-with-istio-api.patch - -BuildRequires: golang(github.com/fsnotify/fsnotify) -BuildRequires: golang(github.com/ghodss/yaml) -BuildRequires: golang(github.com/go-logr/logr) -BuildRequires: golang(github.com/gorilla/mux) -BuildRequires: golang(github.com/hashicorp/go-multierror) -BuildRequires: golang(github.com/howeyc/fsnotify) -BuildRequires: golang(github.com/istio/viper) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus) -BuildRequires: golang(github.com/prometheus/prom2json) -BuildRequires: golang(github.com/spaolacci/murmur3) -BuildRequires: golang(github.com/spf13/cobra) -BuildRequires: golang(github.com/spf13/cobra/doc) -BuildRequires: golang(github.com/spf13/pflag) -BuildRequires: golang(go.opencensus.io/stats) -BuildRequires: golang(go.opencensus.io/stats/view) -BuildRequires: golang(go.opencensus.io/tag) -BuildRequires: golang(go.uber.org/zap) -BuildRequires: golang(go.uber.org/zap/zapcore) -BuildRequires: golang(go.uber.org/zap/zapgrpc) -BuildRequires: golang(google.golang.org/grpc/grpclog) -BuildRequires: golang(gopkg.in/natefinch/lumberjack.v2) -BuildRequires: golang(gopkg.in/yaml.v2) -BuildRequires: golang(k8s.io/klog/v2) - -%if %{with check} -# Tests -BuildRequires: golang(github.com/google/uuid) -BuildRequires: golang(github.com/istio/glog) -BuildRequires: golang(github.com/onsi/gomega) -BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(golang.org/x/sync/errgroup) -BuildRequires: golang(gotest.tools/v3/assert) -%endif - -%description -%{common_description} - -%gopkg - -%prep -%goprep -%patch0 -p1 -sed -i "s|github.com/natefinch/lumberjack|gopkg.in/natefinch/lumberjack.v2|" $(find . -type f -iname "*.go") -sed -i 's|github.com/spf13/viper|github.com/istio/viper|' $(find . -type f -iname "*.go") -sed -i 's|github.com/golang/glog|github.com/istio/glog|' $(find . -type f -iname "*.go") -sed -i 's|gotest.tools|gotest.tools/v3|' $(find . -type f -iname "*.go") - -%install -%gopkginstall - -%if %{with check} -%check -# version: fails with go beta due to bad regex -%gocheck -d filewatcher -d version -%endif - -%gopkgfiles - -%changelog -* Thu Jan 19 2023 Fedora Release Engineering - 1.8.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Aug 10 2022 Maxwell G - 1.8.2-7 -- Rebuild to fix FTBFS - -* Thu Jul 21 2022 Fedora Release Engineering - 1.8.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.8.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 23:23:11 CET 2021 Robert-André Mauchin - 1.8.2-2 -- Fix BuildRequires with patch syncing with istio-api - -* Fri Jan 22 20:32:25 CET 2021 Robert-André Mauchin - 1.8.2-1 -- Update to 1.8.2 - -* Tue Sep 08 22:15:33 CEST 2020 Robert-André Mauchin - 1.7.0-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index 2e82b29..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (pkg-1.8.2.tar.gz) = f84b5745cdbf19a0e71c50e2d0d2ae5c4218a7c1ecea21fefb67d99488a155a40ecf5b9dc8d0bcdc3a26e5da0ed96be2fe8cc7d7acd2353285b52861074926ab