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

New version 0.7.0-beta #110

Merged
merged 1 commit into from
Nov 20, 2023
Merged

New version 0.7.0-beta #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.7.0-beta (November 20, 2023)
IMPROVEMENTS:
* provider: Update ciscoisesdk from v1.1.19 to v1.2.0

## 0.6.22-beta (August 09, 2023)
BUG FIXES:
* Resource 'ciscoise_network_access_policy_set' does not support nested children blocks #101
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ HOSTNAME=hashicorp.com
NAMESPACE=edu
NAME=ciscoise
BINARY=terraform-provider-${NAME}
VERSION=0.6.22-beta
VERSION=0.7.0-beta
OS_ARCH=darwin_amd64
GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
default: install
Expand Down
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ terraform {
required_providers {
ciscoise = {
source = "CiscoISE/ciscoise"
version = "0.6.22-beta"
version = "0.7.0-beta"
}
}
}
Expand Down Expand Up @@ -67,7 +67,7 @@ terraform {
required_providers {
ciscoise = {
source = "hashicorp.com/edu/ciscoise"
version = "0.6.22-beta"
version = "0.7.0-beta"
}
}
}
Expand Down Expand Up @@ -119,7 +119,8 @@ The following table shows the supported versions.

| Cisco ISE version | Terraform "ciscoise" provider version | Go "ciscoise-go-sdk" version|
|-------------------|---------------------------------------|---------------------|
| 3.1._Patch_1 | 0.6.22-beta | 1.1.19 |
| 3.1_Patch_1 | 0.6.22-beta | 1.1.19 |
| 3.2-Beta | 0.7.0-beta | 1.2.0 |

If your SDK, Terraform provider is older please consider updating it first.

Expand Down
3 changes: 3 additions & 0 deletions ciscoise/data_source_active_directory_get_user_groups_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,19 @@ func dataSourceActiveDirectoryGetUserGroupsInfo() *schema.Resource {
"additional_data": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{

"name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Computed: true,
},
"value": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Computed: true,
},
},
},
Expand Down
3 changes: 3 additions & 0 deletions ciscoise/data_source_active_directory_is_user_member_of_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,19 @@ func dataSourceActiveDirectoryIsUserMemberOfGroup() *schema.Resource {
"additional_data": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{

"name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Computed: true,
},
"value": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Computed: true,
},
},
},
Expand Down
10 changes: 8 additions & 2 deletions ciscoise/data_source_deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,11 @@ func dataSourceDeployment() *schema.Resource {
Schema: map[string]*schema.Schema{

"http_count": &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"latency_count": &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -201,8 +204,11 @@ func dataSourceDeployment() *schema.Resource {
Schema: map[string]*schema.Schema{

"node": &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
},
},
Expand Down
41 changes: 32 additions & 9 deletions ciscoise/data_source_device_administration_authentication_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},

"identity_source_id": &schema.Schema{
Description: `Identity source id from the identity stores`,
Type: schema.TypeString,
Computed: true,
},
"identity_source_name": &schema.Schema{
Description: `Identity source name from the identity stores`,
Type: schema.TypeString,
Expand Down Expand Up @@ -97,6 +101,11 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{

"attribute_id": &schema.Schema{
Description: `Dictionary attribute id (Optional), used for additional verification`,
Type: schema.TypeString,
Computed: true,
},
"attribute_name": &schema.Schema{
Description: `Dictionary attribute name`,
Type: schema.TypeString,
Expand Down Expand Up @@ -154,7 +163,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Computed: true,
},
"dates_range": &schema.Schema{
Description: `<p>Defines for which date/s TimeAndDate condition will be matched<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Description: `<p>Defines for which date/s TimeAndDate condition will be matched or NOT matched if used in exceptionDates prooperty<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand All @@ -172,7 +181,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
},
},
"dates_range_exception": &schema.Schema{
Description: `<p>Defines for which date/s TimeAndDate condition will be matched<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Description: `<p>Defines for which date/s TimeAndDate condition will be matched or NOT matched if used in exceptionDates prooperty<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand Down Expand Up @@ -205,7 +214,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Computed: true,
},
"hours_range": &schema.Schema{
Description: `<p>Defines for which hours a TimeAndDate condition will be matched<br> Time format - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Description: `<p>Defines for which hours a TimeAndDate condition will be matched or not matched if used in exceptionHours property<br> Time foramt - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand All @@ -223,7 +232,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
},
},
"hours_range_exception": &schema.Schema{
Description: `<p>Defines for which hours a TimeAndDate condition will be matched<br> Time format - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Description: `<p>Defines for which hours a TimeAndDate condition will be matched or not matched if used in exceptionHours property<br> Time foramt - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand Down Expand Up @@ -341,6 +350,11 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{

"identity_source_id": &schema.Schema{
Description: `Identity source id from the identity stores`,
Type: schema.TypeString,
Computed: true,
},
"identity_source_name": &schema.Schema{
Description: `Identity source name from the identity stores`,
Type: schema.TypeString,
Expand Down Expand Up @@ -395,6 +409,11 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{

"attribute_id": &schema.Schema{
Description: `Dictionary attribute id (Optional), used for additional verification`,
Type: schema.TypeString,
Computed: true,
},
"attribute_name": &schema.Schema{
Description: `Dictionary attribute name`,
Type: schema.TypeString,
Expand Down Expand Up @@ -452,7 +471,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Computed: true,
},
"dates_range": &schema.Schema{
Description: `<p>Defines for which date/s TimeAndDate condition will be matched<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Description: `<p>Defines for which date/s TimeAndDate condition will be matched or NOT matched if used in exceptionDates prooperty<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand All @@ -470,7 +489,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
},
},
"dates_range_exception": &schema.Schema{
Description: `<p>Defines for which date/s TimeAndDate condition will be matched<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Description: `<p>Defines for which date/s TimeAndDate condition will be matched or NOT matched if used in exceptionDates prooperty<br> Options are - Date range, for specific date, the same date should be used for start/end date <br> Default - no specific dates<br> In order to reset the dates to have no specific dates Date format - yyyy-mm-dd (MM = month, dd = day, yyyy = year)</p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand Down Expand Up @@ -503,7 +522,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
Computed: true,
},
"hours_range": &schema.Schema{
Description: `<p>Defines for which hours a TimeAndDate condition will be matched<br> Time format - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Description: `<p>Defines for which hours a TimeAndDate condition will be matched or not matched if used in exceptionHours property<br> Time foramt - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand All @@ -521,7 +540,7 @@ func dataSourceDeviceAdministrationAuthenticationRules() *schema.Resource {
},
},
"hours_range_exception": &schema.Schema{
Description: `<p>Defines for which hours a TimeAndDate condition will be matched<br> Time format - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Description: `<p>Defines for which hours a TimeAndDate condition will be matched or not matched if used in exceptionHours property<br> Time foramt - hh:mm ( h = hour , mm = minutes ) <br> Default - All Day </p>`,
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Expand Down Expand Up @@ -720,6 +739,7 @@ func flattenDeviceAdministrationAuthenticationRulesGetDeviceAdminAuthenticationR
var respItems []map[string]interface{}
for _, item := range *items {
respItem := make(map[string]interface{})
respItem["identity_source_id"] = item.IDentitySourceID
respItem["identity_source_name"] = item.IDentitySourceName
respItem["if_auth_fail"] = item.IfAuthFail
respItem["if_process_fail"] = item.IfProcessFail
Expand Down Expand Up @@ -777,6 +797,7 @@ func flattenDeviceAdministrationAuthenticationRulesGetDeviceAdminAuthenticationR
respItem["id"] = item.ID
respItem["name"] = item.Name
respItem["attribute_name"] = item.AttributeName
respItem["attribute_id"] = item.AttributeID
respItem["attribute_value"] = item.AttributeValue
respItem["dictionary_name"] = item.DictionaryName
respItem["dictionary_value"] = item.DictionaryValue
Expand Down Expand Up @@ -901,6 +922,7 @@ func flattenDeviceAdministrationAuthenticationRulesGetDeviceAdminAuthenticationR
return nil
}
respItem := make(map[string]interface{})
respItem["identity_source_id"] = item.IDentitySourceID
respItem["identity_source_name"] = item.IDentitySourceName
respItem["if_auth_fail"] = item.IfAuthFail
respItem["if_process_fail"] = item.IfProcessFail
Expand Down Expand Up @@ -959,6 +981,7 @@ func flattenDeviceAdministrationAuthenticationRulesGetDeviceAdminAuthenticationR
respItem["id"] = item.ID
respItem["name"] = item.Name
respItem["attribute_name"] = item.AttributeName
respItem["attribute_id"] = item.AttributeID
respItem["attribute_value"] = item.AttributeValue
respItem["dictionary_name"] = item.DictionaryName
respItem["dictionary_value"] = item.DictionaryValue
Expand Down
Loading
Loading