refactor: Update field names and styles in policy generation and view…

… components.

internal/ai/policy_generate.go

@@ -36,8 +36,8 @@ type IAMPrincipal struct {
 }
 
 type IAMActionResource struct {
-	IsStar    bool
-	Resources []string
+	IsWildcard bool
+	Resources  []string
 }
 
 var IAMPolicySchema = map[string]interface{}{
@@ -130,7 +130,7 @@ func (ar *IAMActionResource) UnmarshalJSON(data []byte) error {
 	var str string
 	if err := json.Unmarshal(data, &str); err == nil {
 		if str == "*" {
-			ar.IsStar = true
+			ar.IsWildcard = true
 			return nil
 		}
 		ar.Resources = []string{str}
@@ -185,7 +185,7 @@ func (p IAMPrincipal) MarshalJSON() ([]byte, error) {
 }
 
 func (ar IAMActionResource) MarshalJSON() ([]byte, error) {
-	if ar.IsStar {
+	if ar.IsWildcard {
 		return json.Marshal("*")
 	}
 	if len(ar.Resources) == 1 {

pkg/aws/groups/create_policy.go

@@ -129,14 +129,33 @@ func (m CreatePolicy) View() string {
 	v := strings.TrimSuffix(m.form.View(), "\n\n")
 	form := m.lg.NewStyle().Margin(1, 0).Render(v)
 
-	var titles string
+	var titles []string
+	var title string
+
+	if m.controller.State.GetGroup() != nil {
+		titles = append(titles,
+			s.StateHeader.Render("Group Name: "+m.controller.State.GetGroup().Name),
+			s.StateHeader.Render("Group ARN: "+m.controller.State.GetGroup().Arn),
+		)
+	}
+
 	if m.controller.State.GetService() != nil && m.controller.State.GetResource() != nil {
-		titles = lipgloss.JoinVertical(lipgloss.Left,
-			s.ServiceNameHeader.Render("Service Name: "+m.controller.State.GetService().Name),
-			s.ResourceArnHeader.Render("Resource ARN: "+m.controller.State.GetResource().Arn),
+		titles = append(titles,
+			s.StateHeader.Render("Service Name: "+m.controller.State.GetService().Name),
+			s.StateHeader.Render("Resource ARN: "+m.controller.State.GetResource().Arn),
 		)
 	}
 
+	if len(titles) > 0 {
+		// Join the titles vertically
+		title = lipgloss.JoinVertical(lipgloss.Left, titles...)
+
+		// Apply margin-top to the entire title block
+		title = lipgloss.NewStyle().
+			MarginTop(1). // Set the margin top to 2 lines
+			Render(title)
+	}
+
 	// Status (right side)
 	var status string
 	{
@@ -159,7 +178,7 @@ func (m CreatePolicy) View() string {
 	errors := m.form.Errors()
 	header := lipgloss.JoinVertical(lipgloss.Top,
 		m.appBoundaryView("Custom Policy Generator"),
-		titles,
+		title,
 	)
 	if len(errors) > 0 {
 		header = m.appErrorBoundaryView(m.errorView())

pkg/aws/groups/result.go

@@ -173,7 +173,7 @@ func (m Result) collectOverviewRows() [][]string {
 
 func (m Result) formatPolicyRow(policy *models.Policy) []string {
 	if len(policy.Document) > 0 {
-		return []string{"Policy", policy.Name, string(policy.Document)}
+		return []string{"Policy", policy.Name, "new"}
 	}
 	return []string{"Policy", policy.Name, policy.Arn}
 }

pkg/aws/groups/styles.go

@@ -24,8 +24,7 @@ type Styles struct {
 	HeaderText,
 	Status,
 	StatusHeader,
-	ServiceNameHeader,
-	ResourceArnHeader,
+	StateHeader,
 	Highlight,
 	ErrorHeaderText,
 	Help lipgloss.Style
@@ -44,12 +43,9 @@ func NewStyles(lg *lipgloss.Renderer) *Styles {
 		BorderForeground(purple).
 		PaddingLeft(1).
 		MarginTop(1)
-	s.ServiceNameHeader = lipgloss.NewStyle().
+	s.StateHeader = lipgloss.NewStyle().
 		Bold(true).
-		Foreground(green).MarginLeft(2).MarginTop(1)
-	s.ResourceArnHeader = lipgloss.NewStyle().
-		Bold(true).
-		Foreground(green).MarginLeft(2)
+		Foreground(green).MarginLeft(2).MarginTop(0).MarginLeft(2)
 	s.StatusHeader = lg.NewStyle().
 		Foreground(green).
 		Bold(true)

pkg/aws/roles/create_policy.go

@@ -129,14 +129,33 @@ func (m CreatePolicy) View() string {
 	v := strings.TrimSuffix(m.form.View(), "\n\n")
 	form := m.lg.NewStyle().Margin(1, 0).Render(v)
 
-	var titles string
+	var titles []string
+	var title string
+
+	if m.controller.State.GetRole() != nil {
+		titles = append(titles,
+			s.StateHeader.Render("Role Name: "+m.controller.State.GetRole().Name),
+			s.StateHeader.Render("Role ARN: "+m.controller.State.GetRole().Arn),
+		)
+	}
+
 	if m.controller.State.GetService() != nil && m.controller.State.GetResource() != nil {
-		titles = lipgloss.JoinVertical(lipgloss.Left,
-			s.ServiceNameHeader.Render("Service Name: "+m.controller.State.GetService().Name),
-			s.ResourceArnHeader.Render("Resource ARN: "+m.controller.State.GetResource().Arn),
+		titles = append(titles,
+			s.StateHeader.Render("Service Name: "+m.controller.State.GetService().Name),
+			s.StateHeader.Render("Resource ARN: "+m.controller.State.GetResource().Arn),
 		)
 	}
 
+	if len(titles) > 0 {
+		// Join the titles vertically
+		title = lipgloss.JoinVertical(lipgloss.Left, titles...)
+
+		// Apply margin-top to the entire title block
+		title = lipgloss.NewStyle().
+			MarginTop(1). // Set the margin top to 2 lines
+			Render(title)
+	}
+
 	// Status (right side)
 	var status string
 	{
@@ -159,7 +178,7 @@ func (m CreatePolicy) View() string {
 	errors := m.form.Errors()
 	header := lipgloss.JoinVertical(lipgloss.Top,
 		m.appBoundaryView("Custom Policy Generator"),
-		titles,
+		title,
 	)
 	if len(errors) > 0 {
 		header = m.appErrorBoundaryView(m.errorView())

pkg/aws/roles/result.go

@@ -170,7 +170,7 @@ func (m Result) collectOverviewRows() [][]string {
 
 func (m Result) formatPolicyRow(policy *models.Policy) []string {
 	if len(policy.Document) > 0 {
-		return []string{"Policy", policy.Name, string(policy.Document)}
+		return []string{"Policy", policy.Name, "new"}
 	}
 	return []string{"Policy", policy.Name, policy.Arn}
 }

pkg/aws/roles/styles.go

@@ -24,8 +24,7 @@ type Styles struct {
 	HeaderText,
 	Status,
 	StatusHeader,
-	ServiceNameHeader,
-	ResourceArnHeader,
+	StateHeader,
 	Highlight,
 	ErrorHeaderText,
 	Help lipgloss.Style
@@ -44,12 +43,9 @@ func NewStyles(lg *lipgloss.Renderer) *Styles {
 		BorderForeground(purple).
 		PaddingLeft(1).
 		MarginTop(1)
-	s.ServiceNameHeader = lipgloss.NewStyle().
+	s.StateHeader = lipgloss.NewStyle().
 		Bold(true).
-		Foreground(green).MarginLeft(2).MarginTop(1)
-	s.ResourceArnHeader = lipgloss.NewStyle().
-		Bold(true).
-		Foreground(green).MarginLeft(2)
+		Foreground(green).MarginLeft(2).MarginTop(0).MarginLeft(2)
 	s.StatusHeader = lg.NewStyle().
 		Foreground(green).
 		Bold(true)

pkg/aws/users/create_policy.go

@@ -128,14 +128,33 @@ func (m CreatePolicy) View() string {
 	v := strings.TrimSuffix(m.form.View(), "\n\n")
 	form := m.lg.NewStyle().Margin(1, 0).Render(v)
 
-	var titles string
+	var titles []string
+	var title string
+
+	if m.controller.State.GetUser() != nil {
+		titles = append(titles,
+			s.StateHeader.Render("User Name: "+m.controller.State.GetUser().Name),
+			s.StateHeader.Render("User ARN: "+m.controller.State.GetUser().Arn),
+		)
+	}
+
 	if m.controller.State.GetService() != nil && m.controller.State.GetResource() != nil {
-		titles = lipgloss.JoinVertical(lipgloss.Left,
-			s.ServiceNameHeader.Render("Service Name: "+m.controller.State.GetService().Name),
-			s.ResourceArnHeader.Render("Resource ARN: "+m.controller.State.GetResource().Arn),
+		titles = append(titles,
+			s.StateHeader.Render("Service Name: "+m.controller.State.GetService().Name),
+			s.StateHeader.Render("Resource ARN: "+m.controller.State.GetResource().Arn),
 		)
 	}
 
+	if len(titles) > 0 {
+		// Join the titles vertically
+		title = lipgloss.JoinVertical(lipgloss.Left, titles...)
+
+		// Apply margin-top to the entire title block
+		title = lipgloss.NewStyle().
+			MarginTop(1). // Set the margin top to 2 lines
+			Render(title)
+	}
+
 	// Status (right side)
 	var status string
 	{
@@ -158,7 +177,7 @@ func (m CreatePolicy) View() string {
 	errors := m.form.Errors()
 	header := lipgloss.JoinVertical(lipgloss.Top,
 		m.appBoundaryView("Custom Policy Generator"),
-		titles,
+		title,
 	)
 	if len(errors) > 0 {
 		header = m.appErrorBoundaryView(m.errorView())

pkg/aws/users/result.go

@@ -173,7 +173,7 @@ func (m Result) collectOverviewRows() [][]string {
 
 func (m Result) formatPolicyRow(policy *models.Policy) []string {
 	if len(policy.Document) > 0 {
-		return []string{"Policy", policy.Name, string(policy.Document)}
+		return []string{"Policy", policy.Name, "new"}
 	}
 	return []string{"Policy", policy.Name, policy.Arn}
 }

pkg/aws/users/styles.go

@@ -24,8 +24,7 @@ type Styles struct {
 	HeaderText,
 	Status,
 	StatusHeader,
-	ServiceNameHeader,
-	ResourceArnHeader,
+	StateHeader,
 	Highlight,
 	ErrorHeaderText,
 	Help lipgloss.Style
@@ -44,12 +43,9 @@ func NewStyles(lg *lipgloss.Renderer) *Styles {
 		BorderForeground(purple).
 		PaddingLeft(1).
 		MarginTop(1)
-	s.ServiceNameHeader = lipgloss.NewStyle().
+	s.StateHeader = lipgloss.NewStyle().
 		Bold(true).
-		Foreground(green).MarginLeft(2).MarginTop(1)
-	s.ResourceArnHeader = lipgloss.NewStyle().
-		Bold(true).
-		Foreground(green).MarginLeft(2)
+		Foreground(green).MarginLeft(2).MarginTop(0).MarginLeft(2)
 	s.StatusHeader = lg.NewStyle().
 		Foreground(green).
 		Bold(true)