gofumpt and gci

.envrc

@@ -0,0 +1,4 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc="
+fi
+use flake

.gitignore

@@ -8,6 +8,7 @@ _obj
 _test
 bin
 vendor/
+/.direnv/
 
 # Architecture specific extensions/prefixes
 *.[568vq]

.mailmap

@@ -3,3 +3,6 @@ Seán C McCord <[email protected]> Ulexus <[email protected]>
 Sheena Artrip <[email protected]> sheenobu <[email protected]>
 Sharon Allsup <[email protected]> system_user <[email protected]>
 Laurel Lawson <[email protected]> llccs <[email protected]>
+Torrey Searle <[email protected]> tsearle <[email protected]>
+Torrey Searle <[email protected]> tsearle <[email protected]>
+Michael Hall <[email protected]> mikehall76 <[email protected]>

CONTRIBUTORS

@@ -9,13 +9,11 @@ Seán C McCord <[email protected]>
 Sharon Allsup <[email protected]>
 Sheena Artrip <[email protected]>
 Stamkulov Sattar <[email protected]>
+Torrey Searle <[email protected]>
 Vipul <[email protected]>
 William Edward Lee <[email protected]>
 goharahmed <[email protected]>
-mikehall76 <[email protected]>
 mtryfoss <[email protected]>
 realrainer <[email protected]>
 seanchann <[email protected]>
 serfreeman1337 <[email protected]>
-tsearle <[email protected]>
-tsearle <[email protected]>

application.go

@@ -3,7 +3,6 @@ package ari
 // Application represents a communication path interacting with an Asterisk
 // server for application-level resources
 type Application interface {
-
 	// List returns the list of applications in Asterisk, optionally using the key for filtering
 	List(*Key) ([]*Key, error)
 
@@ -72,10 +71,10 @@ func (ah *ApplicationHandle) Data() (ad *ApplicationData, err error) {
 
 // Subscribe subscribes the application to an event source
 // event source may be one of:
-//  - channel:<channelId>
-//  - bridge:<bridgeId>
-//  - endpoint:<tech>/<resource> (e.g. SIP/102)
-//  - deviceState:<deviceName>
+//   - channel:<channelId>
+//   - bridge:<bridgeId>
+//   - endpoint:<tech>/<resource> (e.g. SIP/102)
+//   - deviceState:<deviceName>
 func (ah *ApplicationHandle) Subscribe(eventSource string) (err error) {
 	err = ah.a.Subscribe(ah.key, eventSource)
 	return

ari.proto

@@ -4,20 +4,16 @@ package asterisk.ari;
 
 option go_package = "ari";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
 // Key identifies a unique resource in the system
 message Key {
-   // NOTE: we build our own stringer
-   option (gogoproto.goproto_stringer) = false;
-
 	// Kind indicates the type of resource the Key points to.  e.g., "channel",
 	// "bridge", etc.
 	string kind = 1;
 
 	// ID indicates the unique identifier of the resource
-   string id = 2 [(gogoproto.customname) = "ID"];
+   string id = 2;
 
 	// Node indicates the unique identifier of the Asterisk node on which the
 	// resource exists or will be created
@@ -32,9 +28,6 @@ message Key {
 
 // CallerID describes the name and number which identifies the caller to other endpoints
 message CallerID {
-   // NOTE: we build our own stringer
-   option (gogoproto.goproto_stringer) = false;
-
    // Name is the name of the party
    string name = 1;
 
@@ -48,7 +41,7 @@ message ChannelData {
    Key key = 1;
 
    // Id is the unique ID for this channel (AMI-style)
-   string id = 2 [(gogoproto.customname) = "ID"];
+   string id = 2;
 
    // Name is the name of this channel (tect/name-id)
    string name = 3;
@@ -75,7 +68,7 @@ message ChannelData {
    string language = 10;
 
    // ChannelVars is the list of channel variables set on this channel
-   map<string, string> channelvars = 11 [(gogoproto.customname) = "ChannelVars"];
+   map<string, string> channel_vars = 11;
 
 }
 

asterisk.go

@@ -3,7 +3,6 @@ package ari
 // Asterisk represents a communication path for
 // the Asterisk server for system-level resources
 type Asterisk interface {
-
 	// Info gets data about the asterisk system
 	Info(key *Key) (*AsteriskInfo, error)
 
@@ -41,7 +40,7 @@ type BuildInfo struct {
 // ConfigInfo describes information about the Asterisk configuration
 type ConfigInfo struct {
 	DefaultLanguage string  `json:"default_language"`
-	MaxChannels     int     `json:"max_channels,omitempty"` //omitempty denotes an optional field, meaning the field may not be present if no value is assigned.
+	MaxChannels     int     `json:"max_channels,omitempty"` // omitempty denotes an optional field, meaning the field may not be present if no value is assigned.
 	MaxLoad         float64 `json:"max_load,omitempty"`
 	MaxOpenFiles    int     `json:"max_open_files,omitempty"`
 	Name            string  `json:"name"`  // Asterisk system name
@@ -68,7 +67,6 @@ type SystemInfo struct {
 
 // AsteriskVariables is an interface to interact with Asterisk global variables
 type AsteriskVariables interface {
-
 	// Get returns the value of the given variable; the ID field of the Key is the variable name
 	Get(key *Key) (string, error)
 

bridge.go

@@ -3,7 +3,6 @@ package ari
 // Bridge represents a communication path to an
 // Asterisk server for working with bridge resources
 type Bridge interface {
-
 	// Create creates a bridge
 	Create(key *Key, btype string, name string) (*BridgeHandle, error)
 
@@ -78,7 +77,6 @@ type BridgeData struct {
 
 // BridgeAddChannelOptions describes additional options to be applied to a channel when it is joined to a bridge
 type BridgeAddChannelOptions struct {
-
 	// AbsorbDTMF indicates that DTMF coming from this channel will not be passed through to the bridge
 	AbsorbDTMF bool
 

callerid.go

@@ -2,15 +2,15 @@ package ari
 
 import "errors"
 
-//NOTE: Direct translation from ARI client 2.0
+// NOTE: Direct translation from ARI client 2.0
 
 // CallerIDFromString interprets the provided string
 // as a CallerID.  Usually, this string will be of the following forms:
 //   - "Name" <number>
 //   - <number>
 //   - "Name" number
 func CallerIDFromString(src string) (*CallerID, error) {
-	//TODO: implement complete callerid parser
+	// TODO: implement complete callerid parser
 	return nil, errors.New("CallerIDFromString not yet implemented")
 }
 

client.go

@@ -4,7 +4,6 @@ package ari
 // with an Asterisk ARI server.  It is agnostic to transport
 // and implementation.
 type Client interface {
-
 	// ApplicationName returns the ARI application name by which this client is connected
 	ApplicationName() string
 

client/native/application.go

@@ -3,8 +3,9 @@ package native
 import (
 	"fmt"
 
-	"github.com/CyCoreSystems/ari/v6"
 	"github.com/rotisserie/eris"
+
+	"github.com/CyCoreSystems/ari/v6"
 )
 
 // Application is a native implementation of ARI's Application functions

client/native/asterisk.go

@@ -3,8 +3,9 @@ package native
 import (
 	"fmt"
 
-	"github.com/CyCoreSystems/ari/v6"
 	"github.com/rotisserie/eris"
+
+	"github.com/CyCoreSystems/ari/v6"
 )
 
 // Asterisk provides the ARI Asterisk accessors for a native client

client/native/client.go

@@ -9,20 +9,20 @@ import (
 	"sync"
 	"time"
 
+	"github.com/inconshreveable/log15"
+	"github.com/rotisserie/eris"
+	"golang.org/x/net/websocket"
+
 	"github.com/CyCoreSystems/ari/v6"
 	"github.com/CyCoreSystems/ari/v6/rid"
 	"github.com/CyCoreSystems/ari/v6/stdbus"
-	"github.com/rotisserie/eris"
-
-	"github.com/inconshreveable/log15"
-	"golang.org/x/net/websocket"
 )
 
 // Logger defaults to a discard handler (null output).
 // If you wish to enable logging, you can set your own
 // handler like so:
-// 		ari.Logger.SetHandler(log15.StderrHandler)
 //
+//	ari.Logger.SetHandler(log15.StderrHandler)
 var Logger = log15.New()
 
 func init() {

client/native/config.go

@@ -1,8 +1,9 @@
 package native
 
 import (
-	"github.com/CyCoreSystems/ari/v6"
 	"github.com/rotisserie/eris"
+
+	"github.com/CyCoreSystems/ari/v6"
 )
 
 // Config provides the ARI Configuration accessors for a native client

client/native/logging.go

@@ -1,8 +1,9 @@
 package native
 
 import (
-	"github.com/CyCoreSystems/ari/v6"
 	"github.com/rotisserie/eris"
+
+	"github.com/CyCoreSystems/ari/v6"
 )
 
 // Logging provides the ARI Logging accessors for a native client

config.go

@@ -9,7 +9,6 @@ import (
 // Config represents a transport to the asterisk
 // config ARI resource.
 type Config interface {
-
 	// Get gets the reference to a config object
 	Get(key *Key) *ConfigHandle
 
@@ -40,7 +39,7 @@ func (cd *ConfigData) ID() string {
 	return fmt.Sprintf("%s/%s/%s", cd.Class, cd.Type, cd.Name)
 }
 
-//ConfigTupleList wrap a list for asterisk ari require.
+// ConfigTupleList wrap a list for asterisk ari require.
 type ConfigTupleList struct {
 	Fields []ConfigTuple `json:"fields"`
 }

datetime_test.go

@@ -16,15 +16,15 @@ var dtMarshalTests = []struct {
 	Output   string
 	HasError bool
 }{
-	{dtTest{DateTime(time.Date(2005, 02, 04, 13, 12, 6, 0, time.UTC))}, `{"dt":"2005-02-04T13:12:06.000+0000"}`, false},
+	{dtTest{DateTime(time.Date(2005, 0o2, 0o4, 13, 12, 6, 0, time.UTC))}, `{"dt":"2005-02-04T13:12:06.000+0000"}`, false},
 }
 
 var dtUnmarshalTests = []struct {
 	Input    string
 	Output   dtTest
 	HasError bool
 }{
-	{`{"dt":"2005-02-04T13:12:06.000+0000"}`, dtTest{DateTime(time.Date(2005, 02, 04, 13, 12, 6, 0, time.UTC))}, false},
+	{`{"dt":"2005-02-04T13:12:06.000+0000"}`, dtTest{DateTime(time.Date(2005, 0o2, 0o4, 13, 12, 6, 0, time.UTC))}, false},
 	{`{"dt":"2x05-02-04T13:12:06.000+0000"}`, dtTest{}, true},
 	{`{"dt": 0 }`, dtTest{}, true},
 }

endpoint.go

@@ -11,7 +11,6 @@ const EndpointIDSeparator = "|" // TODO: confirm separator isn't terrible
 // Endpoint represents a communication path to an Asterisk server
 // for endpoint resources
 type Endpoint interface {
-
 	// List lists the endpoints
 	List(filter *Key) ([]*Key, error)
 

events_gen.go

@@ -100,7 +100,6 @@ func init() {
 	Events.StasisEnd = "StasisEnd"
 	Events.StasisStart = "StasisStart"
 	Events.TextMessageReceived = "TextMessageReceived"
-
 }
 
 // DecodeEvent converts a JSON-encoded event to an ARI event.

ext/bridgemon/bridgemon.go

@@ -135,7 +135,6 @@ func (m *Monitor) Key() *ari.Key {
 // destoyed.
 //
 // NOTE:  the user should NEVER close this channel directly.
-//
 func (m *Monitor) Watch() <-chan *ari.BridgeData {
 	ch := make(chan *ari.BridgeData)
 

ext/play/logger.go

@@ -5,8 +5,8 @@ import "github.com/inconshreveable/log15"
 // Logger defaults to a discard handler (null output).
 // If you wish to enable logging, you can set your own
 // handler like so:
-// 		ari.Logger.SetHandler(log15.StderrHandler)
 //
+//	ari.Logger.SetHandler(log15.StderrHandler)
 var Logger = log15.New()
 
 func init() {

ext/play/options.go

@@ -332,12 +332,11 @@ func PlaybackStartTimeout(timeout time.Duration) OptionFunc {
 
 // DigitTimeouts sets the digit timeouts.  Passing a negative value to any of these indicates that the default value (shown in parentheses below) should be used.
 //
-//  - First digit timeout (4 sec):  The time (after the stop of the audio) to wait for the first digit to be received
+//   - First digit timeout (4 sec):  The time (after the stop of the audio) to wait for the first digit to be received
 //
-//  - Inter digit timeout (3 sec):  The time (after receiving a digit) to wait for the _next_ digit to be received
-//
-//  - Overall digit timeout (3 min):  The maximum amount of time to wait (after the stop of the audio) for digits to be received, regardless of the digit frequency
+//   - Inter digit timeout (3 sec):  The time (after receiving a digit) to wait for the _next_ digit to be received
 //
+//   - Overall digit timeout (3 min):  The maximum amount of time to wait (after the stop of the audio) for digits to be received, regardless of the digit frequency
 func DigitTimeouts(first, inter, overall time.Duration) OptionFunc {
 	return func(o *Options) error {
 		if first >= 0 {

ext/play/play_test.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/mock"
+
 	"github.com/CyCoreSystems/ari/v6"
 	"github.com/CyCoreSystems/ari/v6/client/arimocks"
-
-	"github.com/stretchr/testify/mock"
 )
 
 type playStagedTest struct {

ext/play/sequence.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"time"
 
+	"github.com/rotisserie/eris"
+
 	"github.com/CyCoreSystems/ari/v6"
 	"github.com/CyCoreSystems/ari/v6/rid"
-	"github.com/rotisserie/eris"
 )
 
 // sequence represents an audio sequence playback session

ext/play/sequence_test.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/mock"
+
 	"github.com/CyCoreSystems/ari/v6"
 	"github.com/CyCoreSystems/ari/v6/client/arimocks"
-
-	"github.com/stretchr/testify/mock"
 )
 
 type sequenceTest struct {

ext/play/session.go

@@ -242,7 +242,7 @@ func (s *playSession) Stop() {
 	}
 
 	s.mu.Lock()
-	
+
 	if !s.closed {
 		s.closed = true
 		close(s.done)

ext/record/logger.go

@@ -5,8 +5,8 @@ import "github.com/inconshreveable/log15"
 // Logger defaults to a discard handler (null output).
 // If you wish to enable logging, you can set your own
 // handler like so:
-// 		ari.Logger.SetHandler(log15.StderrHandler)
 //
+//	ari.Logger.SetHandler(log15.StderrHandler)
 var Logger = log15.New()
 
 func init() {

ext/record/record.go

@@ -7,9 +7,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/rotisserie/eris"
+
 	"github.com/CyCoreSystems/ari/v6"
 	"github.com/CyCoreSystems/ari/v6/rid"
-	"github.com/rotisserie/eris"
 )
 
 var (