Skip to content

Commit

Permalink
Merge branch 'master' into fix/permissions-related-resource-ignored
Browse files Browse the repository at this point in the history
  • Loading branch information
ilia-medvedev-codefresh authored Jul 15, 2024
2 parents 0716c8b + 00f3822 commit 789a53e
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/draft-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
jobs:
update_release_draft:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- uses: release-drafter/release-drafter@v5
env:
Expand Down
2 changes: 1 addition & 1 deletion codefresh/data_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func dataSourceAccount() *schema.Resource {
return &schema.Resource{
Description: "This data source retrieves an account by _id or name.",
Description: "This data source retrieves an account by _id or name. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.",
Read: dataSourceAccountRead,
Schema: map[string]*schema.Schema{
"_id": {
Expand Down
2 changes: 1 addition & 1 deletion codefresh/data_idps.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

func dataSourceIdps() *schema.Resource {
return &schema.Resource{
Description: "This data source retrieves all Identity Providers (IdPs) in the system.",
Description: "This data source retrieves all Identity Providers (IdPs) in the system. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.",
Read: dataSourceIdpRead,
Schema: IdpSchema(),
}
Expand Down
2 changes: 1 addition & 1 deletion codefresh/data_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

func dataSourceUser() *schema.Resource {
return &schema.Resource{
Description: "This data source retrieves a user by email.",
Description: "This data source retrieves a user by email. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.",
Read: dataSourceUserRead,
Schema: *UserSchema(),
}
Expand Down
2 changes: 1 addition & 1 deletion codefresh/data_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func dataSourceUsers() *schema.Resource {
return &schema.Resource{
Description: "This data source retrieves all users in the system.",
Description: "This data source retrieves all users in the system. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.",
Read: dataSourceUsersRead,
Schema: map[string]*schema.Schema{
"users": {
Expand Down
2 changes: 1 addition & 1 deletion codefresh/resource_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
func resourceAccount() *schema.Resource {
return &schema.Resource{
Description: `
By creating different accounts for different teams within the same company a customer can achieve complete segregation of assets between the teams.
By creating different accounts for different teams within the same company a customer can achieve complete segregation of assets between the teams. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
`,
Create: resourceAccountCreate,
Read: resourceAccountRead,
Expand Down
2 changes: 1 addition & 1 deletion codefresh/resource_account_admins.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
func resourceAccountAdmins() *schema.Resource {
return &schema.Resource{
Description: `
Use this resource to set a list of admins for any account.
Use this resource to set a list of admins for any account. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
`,
Create: resourceAccountAdminsCreate,
Read: resourceAccountAdminsRead,
Expand Down
1 change: 1 addition & 0 deletions codefresh/resource_api_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ func resourceApiKey() *schema.Resource {
return &schema.Resource{
Description: `
Manages an API Key tied to an Account and a User.
Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
`,
Create: resourceApiKeyCreate,
Read: resourceApiKeyRead,
Expand Down
2 changes: 1 addition & 1 deletion codefresh/resource_idp.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

func resourceIdp() *schema.Resource {
return &schema.Resource{
Description: "Codefresh global level identity provider. Requires Codefresh admin token, hence is relevant only for on-prem deployments of Codefresh",
Description: "Codefresh global level identity provider. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.",
Create: resourceIDPCreate,
Read: resourceIDPRead,
Update: resourceIDPUpdate,
Expand Down
2 changes: 1 addition & 1 deletion codefresh/resource_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

func resourceUser() *schema.Resource {
return &schema.Resource{
Description: "This resource is used to manage a Codefresh user.",
Description: "This resource is used to manage a Codefresh user. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.",
Create: resourceUsersCreate,
Read: resourceUsersRead,
Update: resourceUsersUpdate,
Expand Down
4 changes: 2 additions & 2 deletions docs/data-sources/account.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_account Data Source - terraform-provider-codefresh"
subcategory: ""
description: |-
This data source retrieves an account by _id or name.
This data source retrieves an account by _id or name. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_account (Data Source)

This data source retrieves an account by _id or name.
This data source retrieves an account by _id or name. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

## Example Usage

Expand Down
4 changes: 2 additions & 2 deletions docs/data-sources/idps.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_idps Data Source - terraform-provider-codefresh"
subcategory: ""
description: |-
This data source retrieves all Identity Providers (IdPs) in the system.
This data source retrieves all Identity Providers (IdPs) in the system. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_idps (Data Source)

This data source retrieves all Identity Providers (IdPs) in the system.
This data source retrieves all Identity Providers (IdPs) in the system. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

## Example Usage

Expand Down
4 changes: 2 additions & 2 deletions docs/data-sources/user.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_user Data Source - terraform-provider-codefresh"
subcategory: ""
description: |-
This data source retrieves a user by email.
This data source retrieves a user by email. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_user (Data Source)

This data source retrieves a user by email.
This data source retrieves a user by email. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

## Example usage

Expand Down
4 changes: 2 additions & 2 deletions docs/data-sources/users.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_users Data Source - terraform-provider-codefresh"
subcategory: ""
description: |-
This data source retrieves all users in the system.
This data source retrieves all users in the system. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_users (Data Source)

This data source retrieves all users in the system.
This data source retrieves all users in the system. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

## Example usage

Expand Down
4 changes: 2 additions & 2 deletions docs/resources/account.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_account Resource - terraform-provider-codefresh"
subcategory: ""
description: |-
By creating different accounts for different teams within the same company a customer can achieve complete segregation of assets between the teams.
By creating different accounts for different teams within the same company a customer can achieve complete segregation of assets between the teams. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_account (Resource)

By creating different accounts for different teams within the same company a customer can achieve complete segregation of assets between the teams.
By creating different accounts for different teams within the same company a customer can achieve complete segregation of assets between the teams. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

See the [documentation](https://codefresh.io/docs/docs/administration/account-user-management/).

Expand Down
4 changes: 2 additions & 2 deletions docs/resources/account_admins.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_account_admins Resource - terraform-provider-codefresh"
subcategory: ""
description: |-
Use this resource to set a list of admins for any account.
Use this resource to set a list of admins for any account. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_account_admins (Resource)

Use this resource to set a list of admins for any account.
Use this resource to set a list of admins for any account. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

## Example usage

Expand Down
2 changes: 1 addition & 1 deletion docs/resources/account_gitops_settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ resource "codefresh_account_gitops_settings" "gitops-settings" {
- `id` (String) Account Id
- `name` (String) Account name for active account

[!WARNING]
~>
Once internal config repository is cloned successfully by one or more runtimes it can no longer be changed and all attempted updates will fail.
If you need to change the repository please contact Codefresh support.

Expand Down
2 changes: 2 additions & 0 deletions docs/resources/api_key.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ page_title: "codefresh_api_key Resource - terraform-provider-codefresh"
subcategory: ""
description: |-
Manages an API Key tied to an Account and a User.
Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_api_key (Resource)

Manages an API Key tied to an Account and a User.
Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

terraform-provider-codefresh itself uses an API key, passed as provider's attribute, but it's possible to use that API Key to generate a new one.
This resource requires Codefresh system admin permissions, hence is relevant for on-prem deployments of Codefresh only.
Expand Down
4 changes: 2 additions & 2 deletions docs/resources/idp.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_idp Resource - terraform-provider-codefresh"
subcategory: ""
description: |-
Codefresh global level identity provider. Requires Codefresh admin token, hence is relevant only for on-prem deployments of Codefresh
Codefresh global level identity provider. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_idp (Resource)

Codefresh global level identity provider. Requires Codefresh admin token, hence is relevant only for on-prem deployments of Codefresh
Codefresh global level identity provider. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.

## Example usage
```hcl
Expand Down
4 changes: 2 additions & 2 deletions docs/resources/user.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
page_title: "codefresh_user Resource - terraform-provider-codefresh"
subcategory: ""
description: |-
This resource is used to manage a Codefresh user.
This resource is used to manage a Codefresh user. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.
---

# codefresh_user (Resource)

This resource is used to manage a Codefresh user.
This resource is used to manage a Codefresh user. Requires a Codefresh admin token and applies only to Codefresh on-premises installations.



Expand Down
2 changes: 1 addition & 1 deletion templates/resources/account_gitops_settings.md.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resource "codefresh_account_gitops_settings" "gitops-settings" {

{{ .SchemaMarkdown | trimspace }}

[!WARNING]
~>
Once internal config repository is cloned successfully by one or more runtimes it can no longer be changed and all attempted updates will fail.
If you need to change the repository please contact Codefresh support.

Expand Down

0 comments on commit 789a53e

Please sign in to comment.