Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i/prompting: add package for prompting common types/functions #13849

Merged
merged 15 commits into from
May 1, 2024
Merged

i/prompting: add package for prompting common types/functions #13849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dbddf6b
i/prompting: add package for prompting common types/functions
olivercalder Aug 8, 2023
6a71217
i/prompting,snap: replace LabelToSnap with SplitSecurityTag
olivercalder Apr 18, 2024
74cc30b
i/prompting: removed unused NewID function
olivercalder Apr 18, 2024
a428025
i/prompting: removed unused CurrentTimestamp function
olivercalder Apr 18, 2024
29920e0
i/prompting: rearrange functions
olivercalder Apr 18, 2024
0f9b8d2
snap: check that app is non-empty if it exists in security label
olivercalder Apr 22, 2024
05030d3
i/prompting: use time.Time for timestamp and *time.Time for expiration
olivercalder Apr 24, 2024
617e192
i/prompting: store expiration as time.Time instead of *time.Time
olivercalder Apr 24, 2024
a9031f6
i/prompting: rename AsBool to IsAllow and adjust related error messages
olivercalder Apr 24, 2024
01d2a87
snap: remove SplitSecurityTag function
olivercalder Apr 24, 2024
4adc766
i/prompting: remove LifespanSession
olivercalder Apr 24, 2024
4fe163d
i/prompting: validate outcome and lifespan when unmarshalling
olivercalder Apr 27, 2024
ccca57a
i/prompting: remove NewIDAndTimestamp
olivercalder Apr 27, 2024
6a8609a
i/prompting: replaced ValidateLifespan* functions with methods on lif…
olivercalder Apr 29, 2024
9875909
i/prompting: add doc string and adjusted error messages and comments
olivercalder Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
i/prompting: removed unused NewID function 
Signed-off-by: Oliver Calder <oliver.calder@canonical.com>
  • Loading branch information
@olivercalder
olivercalder committed Apr 18, 2024
commit 74cc30b5a774577ec72d1030be6b22f0fc207af9
11 changes: 0 additions & 11 deletions interfaces/prompting/prompting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,6 @@ func CurrentTimestamp() string {
return time.Now().Format(time.RFC3339Nano)
}

// NewID returns a new unique ID.
//
// The ID is the current unix time in nanoseconds encoded as base32.
func NewID() string {
nowUnix := uint64(time.Now().UnixNano())
nowBytes := make([]byte, 8)
binary.BigEndian.PutUint64(nowBytes, nowUnix)
id := base32.StdEncoding.EncodeToString(nowBytes)
return id
}

// NewIDAndTimestamp returns a new unique ID and corresponding timestamp.
//
// The ID is the current unix time in nanoseconds encoded as a string in base32.
Expand Down
2 changes: 1 addition & 1 deletion interfaces/prompting/prompting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (s *promptingSuite) TestTimestamps(c *C) {

func (s *promptingSuite) TestNewIDAndTimestamp(c *C) {
before := time.Now()
id := prompting.NewID()
id, _ := prompting.NewIDAndTimestamp()
idPaired, timestampPaired := prompting.NewIDAndTimestamp()
after := time.Now()
data1, err := base32.StdEncoding.DecodeString(id)
Expand Down