summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2024-05-30 08:58:07 -0400
committerGitHub <noreply@github.com>2024-05-30 08:58:07 -0400
commite82f04e51aabe709aa4cb674937582f188b4f5db (patch)
tree3cfa2a3d657a3f163e9d30f95b0d78d50e20b677
parent9358a450d3905b23da4e08831ade26e3bdbb5487 (diff)
chore: Clear out a few TODOs with no action (#2087)
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
-rw-r--r--internal/funcs/net.go26
-rw-r--r--internal/iohelpers/writers_test.go54
2 files changed, 0 insertions, 80 deletions
diff --git a/internal/funcs/net.go b/internal/funcs/net.go
index e06b996a..bf8a2674 100644
--- a/internal/funcs/net.go
+++ b/internal/funcs/net.go
@@ -99,27 +99,6 @@ func (f NetFuncs) ParseRange(iprange interface{}) (netipx.IPRange, error) {
return netipx.ParseIPRange(conv.ToString(iprange))
}
-// func (f *NetFuncs) parseStdnetIPNet(prefix interface{}) (*stdnet.IPNet, error) {
-// switch p := prefix.(type) {
-// case *stdnet.IPNet:
-// return p, nil
-// case netaddr.IPPrefix:
-// deprecated.WarnDeprecated(f.ctx,
-// "support for netaddr.IPPrefix is deprecated - use net.ParsePrefix to produce a netip.Prefix instead")
-// return p.Masked().IPNet(), nil
-// case netip.Prefix:
-// net := &stdnet.IPNet{
-// IP: p.Masked().Addr().AsSlice(),
-// Mask: stdnet.CIDRMask(p.Bits(), p.Addr().BitLen()),
-// }
-// return net, nil
-// default:
-// _, network, err := stdnet.ParseCIDR(conv.ToString(prefix))
-// return network, err
-// }
-// }
-
-// TODO: look at using this instead of parseStdnetIPNet
func (f *NetFuncs) parseNetipPrefix(prefix interface{}) (netip.Prefix, error) {
switch p := prefix.(type) {
case *stdnet.IPNet:
@@ -135,11 +114,6 @@ func (f *NetFuncs) parseNetipPrefix(prefix interface{}) (netip.Prefix, error) {
}
}
-// func (f NetFuncs) ipFromNetIP(n stdnet.IP) netip.Addr {
-// ip, _ := netip.AddrFromSlice(n)
-// return ip
-// }
-
func (f NetFuncs) ipPrefixFromIPNet(n *stdnet.IPNet) netip.Prefix {
ip, _ := netip.AddrFromSlice(n.IP)
ones, _ := n.Mask.Size()
diff --git a/internal/iohelpers/writers_test.go b/internal/iohelpers/writers_test.go
index 91e114c4..b2bf7e6d 100644
--- a/internal/iohelpers/writers_test.go
+++ b/internal/iohelpers/writers_test.go
@@ -161,60 +161,6 @@ func TestLazyWriteCloser(t *testing.T) {
require.Error(t, err)
}
-// TODO: uncomment this and fix the import cycle!
-// func TestWrite(t *testing.T) {
-// oldwd, _ := os.Getwd()
-// defer os.Chdir(oldwd)
-
-// rootDir := tfs.NewDir(t, "gomplate-test")
-// t.Cleanup(rootDir.Remove)
-
-// // we want to use a real filesystem here, so we can test interactions with
-// // the current working directory
-// fsys := datafs.WrapWdFS(osfs.NewFS())
-
-// newwd := rootDir.Join("the", "path", "we", "want")
-// badwd := rootDir.Join("some", "other", "dir")
-// hackpadfs.MkdirAll(fsys, newwd, 0o755)
-// hackpadfs.MkdirAll(fsys, badwd, 0o755)
-// newwd, _ = filepath.EvalSymlinks(newwd)
-// badwd, _ = filepath.EvalSymlinks(badwd)
-
-// err := os.Chdir(newwd)
-// require.NoError(t, err)
-
-// err = WriteFile(fsys, "/foo", []byte("Hello world"))
-// require.Error(t, err)
-
-// rel, err := filepath.Rel(newwd, badwd)
-// require.NoError(t, err)
-// err = WriteFile(fsys, rel, []byte("Hello world"))
-// require.Error(t, err)
-
-// foopath := filepath.Join(newwd, "foo")
-// err = WriteFile(fsys, foopath, []byte("Hello world"))
-// require.NoError(t, err)
-
-// out, err := fs.ReadFile(fsys, foopath)
-// require.NoError(t, err)
-// assert.Equal(t, "Hello world", string(out))
-
-// err = WriteFile(fsys, foopath, []byte("truncate"))
-// require.NoError(t, err)
-
-// out, err = fs.ReadFile(fsys, foopath)
-// require.NoError(t, err)
-// assert.Equal(t, "truncate", string(out))
-
-// foopath = filepath.Join(newwd, "nonexistant", "subdir", "foo")
-// err = WriteFile(fsys, foopath, []byte("Hello subdirranean world!"))
-// require.NoError(t, err)
-
-// out, err = fs.ReadFile(fsys, foopath)
-// require.NoError(t, err)
-// assert.Equal(t, "Hello subdirranean world!", string(out))
-// }
-
func TestAssertPathInWD(t *testing.T) {
oldwd, _ := os.Getwd()
defer os.Chdir(oldwd)